From b69c16e682c618371fc60cb5ced92e51650997a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Wed, 6 Dec 2017 20:39:09 +0100
Subject: [PATCH 01/29] Add setting option to scale water refractions

---
 apps/openmw/mwrender/water.cpp | 6 ++++++
 files/settings-default.cfg     | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index c4dffb7a4..dbfee05df 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -272,6 +272,12 @@ public:
 
     void setWaterLevel(float waterLevel)
     {
+        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)));
     }
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index aec667a9c..35748d516 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -376,6 +376,9 @@ reflect actors = false
 # Overrides the value in '[Camera] small feature culling pixel size' specifically for water reflection/refraction textures.
 small feature culling pixel size = 20.0
 
+# By what factor water downscales objects. Only works with water shader and refractions on. 
+refraction scale = 1.0
+
 [Windows]
 
 # Location and sizes of windows as a fraction of the OpenMW window or

From d13fc06baf90b816dcea03c7c4948c49c2379e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Sat, 9 Dec 2017 12:52:28 +0100
Subject: [PATCH 02/29] Add basic refraction scale documentation

---
 .../source/reference/modding/settings/water.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/source/reference/modding/settings/water.rst b/docs/source/reference/modding/settings/water.rst
index a1c6c2068..aceecc630 100644
--- a/docs/source/reference/modding/settings/water.rst
+++ b/docs/source/reference/modding/settings/water.rst
@@ -88,3 +88,20 @@ This setting will have no effect if the shader setting is false,
 or the 'small feature culling' (in the 'Camera' section) is disabled.
 
 This setting can only be configured by editing the settings configuration file.
+
+refraction scale
+----------------
+
+:Type:		floating point
+:Range:		0 to 1
+:Default:	1.0
+
+Simulates light rays refracting when transitioning from air to water, which causes the space under water look scaled down
+in height when viewed from above the water surface. Though adding realism, the setting can cause distortion which can
+make for example aiming at enemies in water more challenging, so it is off by default (i.e. set to 1.0).
+
+This setting only applies if water shader is on and refractions are enabled. Note that if refractions are enabled and this
+setting if off, there will still be small refractions caused by the water waves, which however do not cause such significant
+distortion.
+
+TODO: setting via GUI? Interation with rttsize?

From ee40b41285cce4af6a49e6c91f98dac75afaaa0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Sat, 9 Dec 2017 14:03:56 +0100
Subject: [PATCH 03/29] Add slider for refraction size in settings window

---
 apps/openmw/mwrender/water.cpp                |  2 +-
 .../reference/modding/settings/water.rst      |  2 +-
 files/mygui/openmw_settings_window.layout     | 24 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index dbfee05df..043f1f697 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -272,7 +272,7 @@ 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.01f,     // 0.0 crashes the game
             Settings::Manager::getFloat("refraction scale", "Water")));
 
         setViewMatrix(osg::Matrix::scale(1,1,refractionScale) *
diff --git a/docs/source/reference/modding/settings/water.rst b/docs/source/reference/modding/settings/water.rst
index aceecc630..ab87c77e5 100644
--- a/docs/source/reference/modding/settings/water.rst
+++ b/docs/source/reference/modding/settings/water.rst
@@ -104,4 +104,4 @@ 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.
 
-TODO: setting via GUI? Interation with rttsize?
+This setting can be edited with the 'Refraction scale' slider in the Water tab of the Video panel of the Options menu.
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 8ff850cae..6e377b284 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -394,8 +394,30 @@
                                     <Property key="Caption" value="Reflect actors"/>
                                 </Widget>
                             </Widget>
+                            <Widget type="TextBox" skin="NormalText" position="4 84 350 18" align="Left Top">
+                              <Property key="Caption" value="Refraction scale"/>
+                            </Widget>
+                            <Widget type="HBox" skin="" position="4 112 350 24">
+                              <Widget type="MWScrollBar" skin="MW_HScroll" position="4 154 200 18" align="Left Top">
+                              <Property key="Range" value="10000"/>
+                              <Property key="Page" value="100"/>
+                              <UserString key="SettingType" value="Slider"/>
+                              <UserString key="SettingCategory" value="Water"/>
+                              <UserString key="SettingName" value="refraction scale"/>
+                              <UserString key="SettingValueType" value="Float"/>
+                              <UserString key="SettingMin" value="0.01"/>
+                              <UserString key="SettingMax" value="1.0"/>
+                              </Widget>
+                            </Widget>
+                            <Widget type="TextBox" skin="SandText" position="4 140 200 18" align="Left Top">
+                              <Property key="Caption" value="0"/>
+                              <Property key="TextAlign" value="Left"/>
+                            </Widget>
+                            <Widget type="TextBox" skin="SandText" position="4 140 200 18" align="Left Top">
+                              <Property key="Caption" value="1"/>
+                              <Property key="TextAlign" value="Right"/>
+                            </Widget>
                         </Widget>
-
                     </Widget>
                     <!--
                     <Widget type="TabItem" skin="" position="0 28 352 268">

From 3b741dc4b75ab3feb225492634c669fc0c3073b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Mon, 1 Jan 2018 13:28:14 +0100
Subject: [PATCH 04/29] Revert "Add slider for refraction size in settings
 window"

This reverts commit ee40b41285cce4af6a49e6c91f98dac75afaaa0c.
---
 apps/openmw/mwrender/water.cpp                |  2 +-
 .../reference/modding/settings/water.rst      |  2 +-
 files/mygui/openmw_settings_window.layout     | 24 +------------------
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 043f1f697..dbfee05df 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -272,7 +272,7 @@ public:
 
     void setWaterLevel(float waterLevel)
     {
-        const float refractionScale = std::min(1.0f,std::max(0.01f,     // 0.0 crashes the game
+        const float refractionScale = std::min(1.0f,std::max(0.0f,
             Settings::Manager::getFloat("refraction scale", "Water")));
 
         setViewMatrix(osg::Matrix::scale(1,1,refractionScale) *
diff --git a/docs/source/reference/modding/settings/water.rst b/docs/source/reference/modding/settings/water.rst
index ab87c77e5..aceecc630 100644
--- a/docs/source/reference/modding/settings/water.rst
+++ b/docs/source/reference/modding/settings/water.rst
@@ -104,4 +104,4 @@ 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.
 
-This setting can be edited with the 'Refraction scale' slider in the Water tab of the Video panel of the Options menu.
+TODO: setting via GUI? Interation with rttsize?
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 6e377b284..8ff850cae 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -394,30 +394,8 @@
                                     <Property key="Caption" value="Reflect actors"/>
                                 </Widget>
                             </Widget>
-                            <Widget type="TextBox" skin="NormalText" position="4 84 350 18" align="Left Top">
-                              <Property key="Caption" value="Refraction scale"/>
-                            </Widget>
-                            <Widget type="HBox" skin="" position="4 112 350 24">
-                              <Widget type="MWScrollBar" skin="MW_HScroll" position="4 154 200 18" align="Left Top">
-                              <Property key="Range" value="10000"/>
-                              <Property key="Page" value="100"/>
-                              <UserString key="SettingType" value="Slider"/>
-                              <UserString key="SettingCategory" value="Water"/>
-                              <UserString key="SettingName" value="refraction scale"/>
-                              <UserString key="SettingValueType" value="Float"/>
-                              <UserString key="SettingMin" value="0.01"/>
-                              <UserString key="SettingMax" value="1.0"/>
-                              </Widget>
-                            </Widget>
-                            <Widget type="TextBox" skin="SandText" position="4 140 200 18" align="Left Top">
-                              <Property key="Caption" value="0"/>
-                              <Property key="TextAlign" value="Left"/>
-                            </Widget>
-                            <Widget type="TextBox" skin="SandText" position="4 140 200 18" align="Left Top">
-                              <Property key="Caption" value="1"/>
-                              <Property key="TextAlign" value="Right"/>
-                            </Widget>
                         </Widget>
+
                     </Widget>
                     <!--
                     <Widget type="TabItem" skin="" position="0 28 352 268">

From a73ab39fdd91e98c02bceed6577546f8e830d7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Mon, 1 Jan 2018 13:42:16 +0100
Subject: [PATCH 05/29] Update refraction scaling docs

---
 docs/source/reference/modding/settings/water.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/reference/modding/settings/water.rst b/docs/source/reference/modding/settings/water.rst
index aceecc630..bd0741da9 100644
--- a/docs/source/reference/modding/settings/water.rst
+++ b/docs/source/reference/modding/settings/water.rst
@@ -98,10 +98,10 @@ refraction scale
 
 Simulates light rays refracting when transitioning from air to water, which causes the space under water look scaled down
 in height when viewed from above the water surface. Though adding realism, the setting can cause distortion which can
-make for example aiming at enemies in water more challenging, so it is off by default (i.e. set to 1.0).
+make for example aiming at enemies in water more challenging, so it is off by default (i.e. set to 1.0). To get a realistic
+look of real-life water, set the value to 0.75.
 
 This setting only applies if water shader is on and refractions are enabled. Note that if refractions are enabled and this
 setting if off, there will still be small refractions caused by the water waves, which however do not cause such significant
 distortion.
 
-TODO: setting via GUI? Interation with rttsize?

From 83726ee06a3a38f098a392722379d0055b30a110 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Thu, 11 Jan 2018 01:47:42 +0000
Subject: [PATCH 06/29] Fix Reset Controls button not functioning properly

---
 apps/openmw/mwinput/inputmanagerimp.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 3e96f6da9..400dd7213 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -1242,13 +1242,13 @@ namespace MWInput
                 clearAllKeyBindings(control);
 
                 if (defaultKeyBindings.find(i) != defaultKeyBindings.end()
-                        && !mInputBinder->isKeyBound(defaultKeyBindings[i]))
+                        && (force || !mInputBinder->isKeyBound(defaultKeyBindings[i])))
                 {
                     control->setInitialValue(0.0f);
                     mInputBinder->addKeyBinding(control, defaultKeyBindings[i], ICS::Control::INCREASE);
                 }
                 else if (defaultMouseButtonBindings.find(i) != defaultMouseButtonBindings.end()
-                         && !mInputBinder->isMouseButtonBound(defaultMouseButtonBindings[i]))
+                         && (force || !mInputBinder->isMouseButtonBound(defaultMouseButtonBindings[i])))
                 {
                     control->setInitialValue(0.0f);
                     mInputBinder->addMouseButtonBinding (control, defaultMouseButtonBindings[i], ICS::Control::INCREASE);
@@ -1322,12 +1322,12 @@ namespace MWInput
                 clearAllControllerBindings(control);
 
                 if (defaultButtonBindings.find(i) != defaultButtonBindings.end()
-                        && !mInputBinder->isJoystickButtonBound(mFakeDeviceID, defaultButtonBindings[i]))
+                        && (force || !mInputBinder->isJoystickButtonBound(mFakeDeviceID, defaultButtonBindings[i])))
                 {
                     control->setInitialValue(0.0f);
                     mInputBinder->addJoystickButtonBinding(control, mFakeDeviceID, defaultButtonBindings[i], ICS::Control::INCREASE);
                 }
-                else if (defaultAxisBindings.find(i) != defaultAxisBindings.end() && !mInputBinder->isJoystickAxisBound(mFakeDeviceID, defaultAxisBindings[i]))
+                else if (defaultAxisBindings.find(i) != defaultAxisBindings.end() && (force || !mInputBinder->isJoystickAxisBound(mFakeDeviceID, defaultAxisBindings[i])))
                 {
                     control->setValue(0.5f);
                     control->setInitialValue(0.5f);

From 1522bda60bfc09ec825bec7e3cd825f76612a6d2 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Thu, 11 Jan 2018 01:48:05 +0000
Subject: [PATCH 07/29] Fix crash in getDistance when invoked before the game
 starts

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

diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 26d7916b1..d70ff5319 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -463,7 +463,7 @@ namespace MWScript
         const MWWorld::Ptr ref = MWBase::Environment::get().getWorld()->getPtr(name, false);
 
         // If the objects are in different worldspaces, return a large value (just like vanilla)
-        if (ref.getCell()->getCell()->getCellId().mWorldspace != ref2.getCell()->getCell()->getCellId().mWorldspace)
+        if (!ref.isInCell() || !ref2.isInCell() || ref.getCell()->getCell()->getCellId().mWorldspace != ref2.getCell()->getCell()->getCellId().mWorldspace)
             return std::numeric_limits<float>::max();
 
         double diff[3];

From bba9a8dd91f65be732d7e68c47281ea71486e54d Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Thu, 11 Jan 2018 01:49:35 +0000
Subject: [PATCH 08/29] Don't update off-screen animations

Make flying creatures animate in-place when out of processing range
---
 apps/openmw/mwmechanics/actors.cpp    | 27 ++++++++++++++++++++-------
 apps/openmw/mwmechanics/character.cpp |  2 +-
 apps/openmw/mwmechanics/character.hpp |  2 +-
 apps/openmw/mwrender/animation.cpp    |  4 ++--
 apps/openmw/mwrender/animation.hpp    |  3 ++-
 components/sceneutil/skeleton.cpp     | 20 +++++++++++++++-----
 components/sceneutil/skeleton.hpp     | 12 ++++++++++--
 7 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index d685967da..7a1e7270d 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1213,14 +1213,12 @@ namespace MWMechanics
              // AI and magic effects update
             for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
             {
+                float distSqr = (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2();
                 // AI processing is only done within distance of 7168 units to the player. Note the "AI distance" slider doesn't affect this
                 // (it only does some throttling for targets beyond the "AI distance", so doesn't give any guarantees as to whether AI will be enabled or not)
                 // This distance could be made configurable later, but the setting must be marked with a big warning:
                 // using higher values will make a quest in Bloodmoon harder or impossible to complete (bug #1876)
-                bool inProcessingRange = (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2()
-                        <= sqrAiProcessingDistance;
-
-                iter->second->getCharacterController()->setActive(inProcessingRange);
+                bool inProcessingRange = distSqr <= sqrAiProcessingDistance;
 
                 if (iter->first == player)
                     iter->second->getCharacterController()->setAttackingOrSpell(MWBase::Environment::get().getWorld()->getPlayer().getAttackingOrSpell());
@@ -1326,9 +1324,24 @@ namespace MWMechanics
             CharacterController* playerCharacter = NULL;
             for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
             {
-                if (iter->first != player &&
-                        (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2()
-                        > sqrAiProcessingDistance)
+                const float animationDistance = aiProcessingDistance + 400; // Slightly larger than AI distance so there is time to switch back to the idle animation.
+                const float distSqr = (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2();
+                bool isPlayer = iter->first == player;
+                bool inAnimationRange = isPlayer || (animationDistance == 0 || distSqr <= animationDistance*animationDistance);
+                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 = inAnimationRange ? activeFlag : 0;
+                bool canFly = iter->first.getClass().canFly(iter->first);
+                if (canFly)
+                {
+                    // Keep animating flying creatures so they don't just hover in-air
+                    inAnimationRange = true;
+                    active = std::max(1, active);
+                }
+                iter->second->getCharacterController()->setActive(active);
+
+                if (!inAnimationRange)
                     continue;
 
                 if (iter->first.getClass().getCreatureStats(iter->first).isParalyzed())
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index fa261bbc3..676f01922 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2392,7 +2392,7 @@ float CharacterController::getAttackStrength() const
     return mAttackStrength;
 }
 
-void CharacterController::setActive(bool active)
+void CharacterController::setActive(int active)
 {
     mAnimation->setActive(active);
 }
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 016d88289..cab51b82f 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -292,7 +292,7 @@ public:
     float getAttackStrength() const;
 
     /// @see Animation::setActive
-    void setActive(bool active);
+    void setActive(int active);
 
     /// Make this character turn its head towards \a target. To turn off head tracking, pass an empty Ptr.
     void setHeadTrackTarget(const MWWorld::ConstPtr& target);
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 16ce9b436..1bd839ead 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -486,10 +486,10 @@ namespace MWRender
         return mPtr;
     }
 
-    void Animation::setActive(bool active)
+    void Animation::setActive(int active)
     {
         if (mSkeleton)
-            mSkeleton->setActive(active);
+            mSkeleton->setActive(static_cast<SceneUtil::Skeleton::ActiveType>(active));
     }
 
     void Animation::updatePtr(const MWWorld::Ptr &ptr)
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 8ac78babc..cff98a4b7 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -347,7 +347,8 @@ public:
 
     /// Set active flag on the object skeleton, if one exists.
     /// @see SceneUtil::Skeleton::setActive
-    void setActive(bool active);
+    /// 0 = Inactive, 1 = Active in place, 2 = Active
+    void setActive(int active);
 
     osg::Group* getOrCreateObjectRoot();
 
diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index 116edfdb4..94ae1f234 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -36,8 +36,9 @@ private:
 Skeleton::Skeleton()
     : mBoneCacheInit(false)
     , mNeedToUpdateBoneMatrices(true)
-    , mActive(true)
+    , mActive(Active)
     , mLastFrameNumber(0)
+    , mLastCullFrameNumber(0)
 {
 
 }
@@ -48,6 +49,7 @@ Skeleton::Skeleton(const Skeleton &copy, const osg::CopyOp &copyop)
     , mNeedToUpdateBoneMatrices(true)
     , mActive(copy.mActive)
     , mLastFrameNumber(0)
+    , mLastCullFrameNumber(0)
 {
 
 }
@@ -123,14 +125,14 @@ void Skeleton::updateBoneMatrices(unsigned int traversalNumber)
     }
 }
 
-void Skeleton::setActive(bool active)
+void Skeleton::setActive(ActiveType active)
 {
     mActive = active;
 }
 
 bool Skeleton::getActive() const
 {
-    return mActive;
+    return mActive != Inactive;
 }
 
 void Skeleton::markDirty()
@@ -142,8 +144,16 @@ void Skeleton::markDirty()
 
 void Skeleton::traverse(osg::NodeVisitor& nv)
 {
-    if (!getActive() && nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR && mLastFrameNumber != 0)
-        return;
+    if (nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
+    {
+        if (mActive == Inactive && mLastFrameNumber != 0)
+            return;
+        if (mActive == SemiActive && mLastFrameNumber != 0 && mLastCullFrameNumber+3 <= nv.getTraversalNumber())
+            return;
+    }
+    else if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
+        mLastCullFrameNumber = nv.getTraversalNumber();
+
     osg::Group::traverse(nv);
 }
 
diff --git a/components/sceneutil/skeleton.hpp b/components/sceneutil/skeleton.hpp
index 245e3522c..1d8069f8e 100644
--- a/components/sceneutil/skeleton.hpp
+++ b/components/sceneutil/skeleton.hpp
@@ -47,9 +47,16 @@ namespace SceneUtil
         /// Request an update of bone matrices. May be a no-op if already updated in this frame.
         void updateBoneMatrices(unsigned int traversalNumber);
 
+        enum ActiveType
+        {
+            Inactive=0,
+            SemiActive, /// Like Active, but don't bother with Update (including new bounding box) if we're off-screen
+            Active
+        };
+
         /// Set the skinning active flag. Inactive skeletons will not have their child rigs updated.
         /// You should set this flag to false if you know that bones are not currently moving.
-        void setActive(bool active);
+        void setActive(ActiveType active);
 
         bool getActive() const;
 
@@ -71,9 +78,10 @@ namespace SceneUtil
 
         bool mNeedToUpdateBoneMatrices;
 
-        bool mActive;
+        ActiveType mActive;
 
         unsigned int mLastFrameNumber;
+        unsigned int mLastCullFrameNumber;
     };
 
 }

From b995617559389991d93da94a4715a14b528d2521 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 11 Jan 2018 21:08:11 +0400
Subject: [PATCH 09/29] implement rateAmmo() function

---
 apps/openmw/mwmechanics/aicombataction.cpp | 42 +++-------------------
 apps/openmw/mwmechanics/weaponpriority.cpp | 28 +++++++++++++++
 apps/openmw/mwmechanics/weaponpriority.hpp |  5 +++
 3 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index df636dd56..0ccd0b6ec 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -182,29 +182,11 @@ namespace MWMechanics
                 }
             }
 
-            float bestArrowRating = 0;
             MWWorld::Ptr bestArrow;
-            for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
-            {
-                float rating = rateWeapon(*it, actor, enemy, ESM::Weapon::Arrow);
-                if (rating > bestArrowRating)
-                {
-                    bestArrowRating = rating;
-                    bestArrow = *it;
-                }
-            }
+            float bestArrowRating = rateAmmo(actor, enemy, bestArrow, ESM::Weapon::Arrow);
 
-            float bestBoltRating = 0;
             MWWorld::Ptr bestBolt;
-            for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
-            {
-                float rating = rateWeapon(*it, actor, enemy, ESM::Weapon::Bolt);
-                if (rating > bestBoltRating)
-                {
-                    bestBoltRating = rating;
-                    bestBolt = *it;
-                }
-            }
+            float bestBoltRating = rateAmmo(actor, enemy, bestBolt, ESM::Weapon::Bolt);
 
             for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
             {
@@ -277,25 +259,9 @@ namespace MWMechanics
                 }
             }
 
-            float bestArrowRating = 0;
-            for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
-            {
-                float rating = rateWeapon(*it, actor, enemy, ESM::Weapon::Arrow);
-                if (rating > bestArrowRating)
-                {
-                    bestArrowRating = rating;
-                }
-            }
+            float bestArrowRating = rateAmmo(actor, enemy, ESM::Weapon::Arrow);
 
-            float bestBoltRating = 0;
-            for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
-            {
-                float rating = rateWeapon(*it, actor, enemy, ESM::Weapon::Bolt);
-                if (rating > bestBoltRating)
-                {
-                    bestBoltRating = rating;
-                }
-            }
+            float bestBoltRating = rateAmmo(actor, enemy, ESM::Weapon::Bolt);
 
             for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
             {
diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index d06e73c93..5a0bd9c15 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -8,6 +8,7 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
 
 #include "npcstats.hpp"
 #include "combat.hpp"
@@ -111,6 +112,33 @@ namespace MWMechanics
         return rating + bonus;
     }
 
+    float rateAmmo(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy, MWWorld::Ptr &bestAmmo, ESM::Weapon::Type ammoType)
+    {
+        float bestAmmoRating = 0.f;
+        if (!actor.getClass().hasInventoryStore(actor))
+            return bestAmmoRating;
+
+        MWWorld::InventoryStore& store = actor.getClass().getInventoryStore(actor);
+
+        for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
+        {
+            float rating = rateWeapon(*it, actor, enemy, ammoType);
+            if (rating > bestAmmoRating)
+            {
+                bestAmmoRating = rating;
+                bestAmmo = *it;
+            }
+        }
+
+        return bestAmmoRating;
+    }
+
+    float rateAmmo(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy, ESM::Weapon::Type ammoType)
+    {
+        MWWorld::Ptr emptyPtr;
+        return rateAmmo(actor, enemy, emptyPtr, ammoType);
+    }
+
     float vanillaRateWeaponAndAmmo(const MWWorld::Ptr& weapon, const MWWorld::Ptr& ammo, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
     {
         const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
diff --git a/apps/openmw/mwmechanics/weaponpriority.hpp b/apps/openmw/mwmechanics/weaponpriority.hpp
index 90a767c4a..f5c9a1159 100644
--- a/apps/openmw/mwmechanics/weaponpriority.hpp
+++ b/apps/openmw/mwmechanics/weaponpriority.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_WEAPON_PRIORITY_H
 #define OPENMW_WEAPON_PRIORITY_H
 
+#include <components/esm/loadweap.hpp>
+
 #include "../mwworld/ptr.hpp"
 
 namespace MWMechanics
@@ -8,6 +10,9 @@ namespace MWMechanics
     float rateWeapon (const MWWorld::Ptr& item, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy,
                       int type=-1, float arrowRating=0.f, float boltRating=0.f);
 
+    float rateAmmo(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy, MWWorld::Ptr &bestAmmo, ESM::Weapon::Type ammoType);
+    float rateAmmo(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy, ESM::Weapon::Type ammoType);
+
     float vanillaRateWeaponAndAmmo(const MWWorld::Ptr& weapon, const MWWorld::Ptr& ammo, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
 }
 

From eccb49da18b6ddef273f08264775fcbe524186ca Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 11 Jan 2018 21:08:30 +0400
Subject: [PATCH 10/29] Do not summon the bound bow if there is no suitable
 ammo

---
 apps/openmw/mwmechanics/spellpriority.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index 3a730fbeb..7aef54007 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -1,4 +1,5 @@
 #include "spellpriority.hpp"
+#include "weaponpriority.hpp"
 
 #include <components/esm/loadench.hpp>
 #include <components/esm/loadmgef.hpp>
@@ -335,6 +336,12 @@ namespace MWMechanics
                 return 0.f;
             break;
 
+        case ESM::MagicEffect::BoundLongbow:
+            // AI should not summon the bow if there is no suitable ammo.
+            if (rateAmmo(actor, enemy, ESM::Weapon::Arrow) <= 0.f)
+                return 0.f;
+            break;
+
         case ESM::MagicEffect::RestoreHealth:
         case ESM::MagicEffect::RestoreMagicka:
         case ESM::MagicEffect::RestoreFatigue:

From 2dff3aab22257089125fbd17f0448a97fdb8560c Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 12 Jan 2018 16:37:06 +0100
Subject: [PATCH 11/29] allow . and - in the name part of a begin script
 statement, but not at the beginning of a name. Fixes #4061

---
 components/compiler/fileparser.cpp |  1 +
 components/compiler/scanner.cpp    | 10 ++++++++--
 components/compiler/scanner.hpp    |  6 ++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/components/compiler/fileparser.cpp b/components/compiler/fileparser.cpp
index 8711d92fe..52a9a63f1 100644
--- a/components/compiler/fileparser.cpp
+++ b/components/compiler/fileparser.cpp
@@ -63,6 +63,7 @@ namespace Compiler
         if (mState==BeginState && keyword==Scanner::K_begin)
         {
             mState = NameState;
+            scanner.enableTolerantNames(); /// \todo disable
             return true;
         }
 
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index c2ec13b01..bb0fb9374 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -27,6 +27,7 @@ namespace Compiler
         if (c=='\n')
         {
             mStrictKeywords = false;
+            mTolerantNames = false;
             mLoc.mColumn = 0;
             ++mLoc.mLine;
             mLoc.mLiteral.clear();
@@ -363,7 +364,7 @@ namespace Compiler
             }
             else if (!(c=='"' && name.empty()))
             {
-                if (!isStringCharacter (c))
+                if (!isStringCharacter (c) && !(mTolerantNames && (c=='.' || c=='-')))
                 {
                     putback (c);
                     break;
@@ -577,7 +578,7 @@ namespace Compiler
         const Extensions *extensions)
     : mErrorHandler (errorHandler), mStream (inputStream), mExtensions (extensions),
       mPutback (Putback_None), mPutbackCode(0), mPutbackInteger(0), mPutbackFloat(0),
-      mStrictKeywords (false)
+      mStrictKeywords (false), mTolerantNames (false)
     {
     }
 
@@ -634,4 +635,9 @@ namespace Compiler
     {
         mStrictKeywords = true;
     }
+
+    void Scanner::enableTolerantNames()
+    {
+        mTolerantNames = true;
+    }
 }
diff --git a/components/compiler/scanner.hpp b/components/compiler/scanner.hpp
index 270782c74..49fbaa96a 100644
--- a/components/compiler/scanner.hpp
+++ b/components/compiler/scanner.hpp
@@ -38,6 +38,7 @@ namespace Compiler
             std::string mPutbackName;
             TokenLoc mPutbackLoc;
             bool mStrictKeywords;
+            bool mTolerantNames;
 
         public:
 
@@ -129,6 +130,11 @@ namespace Compiler
             ///
             /// \attention This mode lasts only until the next newline is reached.
             void enableStrictKeywords();
+
+            /// Continue parsing a name when hitting a '.' or a '-'
+            ///
+            /// \attention This mode lasts only until the next newline is reached.
+            void enableTolerantNames();
     };
 }
 

From 259919d1258292c12df0d6ea8b07d9980fa7da6b Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 14 Jan 2018 00:23:29 +0000
Subject: [PATCH 12/29] Print a warning when an ambiguous file on a
 case-sensitive file system is found

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

diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index ad5150a44..9738e2a17 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -1,5 +1,7 @@
 #include "filesystemarchive.hpp"
 
+#include <iostream>
+
 #include <boost/filesystem.hpp>
 
 namespace VFS
@@ -38,7 +40,8 @@ namespace VFS
 
                 std::transform(proper.begin() + prefix, proper.end(), std::back_inserter(searchable), normalize_function);
 
-                mIndex.insert (std::make_pair (searchable, file));
+                if (!mIndex.insert (std::make_pair (searchable, file)).second)
+                    std::cerr << "Warning: found duplicate file for '" << proper << "', please check your file system for two files with the same name in different cases." << std::endl;
             }
 
             mBuiltIndex = true;

From 80f7279a4de94a0d12f25f3e872f601a88b92342 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 14 Jan 2018 00:24:30 +0000
Subject: [PATCH 13/29] Change default installation directory from 'data' to
 'basedata' (Bug #3557)

---
 apps/wizard/installationtargetpage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wizard/installationtargetpage.cpp b/apps/wizard/installationtargetpage.cpp
index 3a179a2cb..f55794cca 100644
--- a/apps/wizard/installationtargetpage.cpp
+++ b/apps/wizard/installationtargetpage.cpp
@@ -20,7 +20,7 @@ Wizard::InstallationTargetPage::InstallationTargetPage(QWidget *parent, const Fi
 void Wizard::InstallationTargetPage::initializePage()
 {
     QString path(QFile::decodeName(mCfgMgr.getUserDataPath().string().c_str()));
-    path.append(QDir::separator() + QLatin1String("data"));
+    path.append(QDir::separator() + QLatin1String("basedata"));
 
     QDir dir(path);
     targetLineEdit->setText(QDir::toNativeSeparators(dir.absolutePath()));

From 047c44f265d01b754353b15bd6a7f4aafc7d909d Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 14 Jan 2018 00:25:20 +0000
Subject: [PATCH 14/29] Ignore duplicate data directories to work around the
 fallout of (Fixes #3557)

---
 components/vfs/registerarchives.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/components/vfs/registerarchives.cpp b/components/vfs/registerarchives.cpp
index b361e3f42..a22e785cd 100644
--- a/components/vfs/registerarchives.cpp
+++ b/components/vfs/registerarchives.cpp
@@ -1,5 +1,6 @@
 #include "registerarchives.hpp"
 
+#include <set>
 #include <iostream>
 #include <sstream>
 
@@ -33,12 +34,20 @@ namespace VFS
         }
 
         if (useLooseFiles)
+        {
+            std::set<boost::filesystem::path> seen;
             for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
             {
-                std::cout << "Adding data directory " << iter->string() << std::endl;
-                // Last data dir has the highest priority
-                vfs->addArchive(new FileSystemArchive(iter->string()));
+                if (seen.insert(*iter).second)
+                {
+                    std::cout << "Adding data directory " << iter->string() << std::endl;
+                    // Last data dir has the highest priority
+                    vfs->addArchive(new FileSystemArchive(iter->string()));
+                }
+                else
+                    std::cerr << "Ignoring duplicate data directory " << iter->string() << std::endl;
             }
+        }
 
         vfs->buildIndex();
     }

From d9d8de306192a21c216d3dfdab6baadc693eaa05 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 14 Jan 2018 00:26:37 +0000
Subject: [PATCH 15/29] Catch exceptions in updateWindowManager (Bug #4269)

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

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 340876759..36be9cb78 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1757,19 +1757,26 @@ namespace MWWorld
 
     void World::updateWindowManager ()
     {
-        // inform the GUI about focused object
-        MWWorld::Ptr object = getFacedObject ();
-
-        // retrieve object dimensions so we know where to place the floating label
-        if (!object.isEmpty ())
+        try
         {
-            osg::Vec4f screenBounds = mRendering->getScreenBounds(object);
+            // inform the GUI about focused object
+            MWWorld::Ptr object = getFacedObject ();
 
-            MWBase::Environment::get().getWindowManager()->setFocusObjectScreenCoords(
-                screenBounds.x(), screenBounds.y(), screenBounds.z(), screenBounds.w());
-        }
+            // retrieve object dimensions so we know where to place the floating label
+            if (!object.isEmpty ())
+            {
+                osg::Vec4f screenBounds = mRendering->getScreenBounds(object);
 
-        MWBase::Environment::get().getWindowManager()->setFocusObject(object);
+                MWBase::Environment::get().getWindowManager()->setFocusObjectScreenCoords(
+                    screenBounds.x(), screenBounds.y(), screenBounds.z(), screenBounds.w());
+            }
+
+            MWBase::Environment::get().getWindowManager()->setFocusObject(object);
+        }
+        catch (std::exception& e)
+        {
+            std::cerr << "Error updating window manager: " << e.what() << std::endl;
+        }
     }
 
     MWWorld::Ptr World::getFacedObject(float maxDistance, bool ignorePlayer)

From e2e48e0a50f16e4930c3733a5fe873bc92c07b1d Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 14 Jan 2018 00:27:05 +0000
Subject: [PATCH 16/29] Add default value for 'sAnd' GMST (Fixes #4269)

---
 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 36be9cb78..d8f801420 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -435,6 +435,7 @@ namespace MWWorld
         gmst["fNPCHealthBarFade"] = ESM::Variant(1.f);
         gmst["fFleeDistance"] = ESM::Variant(3000.f);
         gmst["sMaxSale"] = ESM::Variant("Max Sale");
+        gmst["sAnd"] = ESM::Variant("and");
 
         // Werewolf (BM)
         gmst["fWereWolfRunMult"] = ESM::Variant(1.3f);

From 2caaa48b911d0459f3fe7c5b3e70d0bb898c62d1 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 14 Jan 2018 00:27:53 +0000
Subject: [PATCH 17/29] Workaround to make sure message box remains on top
 (Fixes #4298)

---
 apps/openmw/mwgui/messagebox.cpp       | 12 +++++++-----
 apps/openmw/mwgui/messagebox.hpp       |  4 ++++
 apps/openmw/mwgui/windowmanagerimp.cpp | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index 7c89c4979..a79112b9f 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -207,8 +207,6 @@ namespace MWGui
       , mMessageBoxManager(parMessageBoxManager)
       , mButtonPressed(-1)
     {
-        setVisible(true);
-
         int textPadding = 10; // padding between text-widget and main-widget
         int textButtonPadding = 10; // padding between the text-widget und the button-widget
         int buttonLeftPadding = 10; // padding between the buttons if horizontal
@@ -358,7 +356,11 @@ namespace MWGui
             mMessageWidget->setCoord(messageWidgetCoord);
         }
 
-        // Set key focus to "Ok" button
+        setVisible(true);
+    }
+
+    MyGUI::Widget* InteractiveMessageBox::getDefaultKeyFocus()
+    {
         std::vector<std::string> keywords { "sOk", "sYes" };
         for(std::vector<MyGUI::Button*>::const_iterator button = mButtons.begin(); button != mButtons.end(); ++button)
         {
@@ -366,11 +368,11 @@ namespace MWGui
             {
                 if(Misc::StringUtils::ciEqual(MyGUI::LanguageManager::getInstance().replaceTags("#{" + keyword + "}"), (*button)->getCaption()))
                 {
-                    MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(*button);
-                    return;
+                    return *button;
                 }
             }
         }
+        return NULL;
     }
 
     void InteractiveMessageBox::mousePressed (MyGUI::Widget* pressed)
diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp
index 53b277416..e0bcbe667 100644
--- a/apps/openmw/mwgui/messagebox.hpp
+++ b/apps/openmw/mwgui/messagebox.hpp
@@ -28,6 +28,8 @@ namespace MWGui
             bool createInteractiveMessageBox (const std::string& message, const std::vector<std::string>& buttons);
             bool isInteractiveMessageBox ();
 
+            const InteractiveMessageBox* getInteractiveMessageBox() const { return mInterMessageBoxe; }
+
             /// Remove all message boxes
             void clear();
 
@@ -77,6 +79,8 @@ namespace MWGui
             void mousePressed (MyGUI::Widget* _widget);
             int readPressedButton ();
 
+            MyGUI::Widget* getDefaultKeyFocus() override;
+
             virtual bool exit() { return false; }
 
             bool mMarkedToDelete;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 2084786b3..300f8e39f 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -874,6 +874,22 @@ namespace MWGui
                     window->onFrame(frameDuration);
         }
 
+        // Make sure message boxes are always in front
+        // This is an awful workaround for a series of awfully interwoven issues that couldn't be worked around
+        // in a better way because of an impressive number of even more awfully interwoven issues.
+        if (mMessageBoxManager && mMessageBoxManager->isInteractiveMessageBox() && mCurrentModals.back() != mMessageBoxManager->getInteractiveMessageBox())
+        {
+            std::vector<WindowModal*>::iterator found = std::find(mCurrentModals.begin(), mCurrentModals.end(), mMessageBoxManager->getInteractiveMessageBox());
+            if (found != mCurrentModals.end())
+            {
+                WindowModal* msgbox = *found;
+                std::swap(*found, mCurrentModals.back());
+                MyGUI::InputManager::getInstance().addWidgetModal(msgbox->mMainWidget);
+                mKeyboardNavigation->setModalWindow(msgbox->mMainWidget);
+                mKeyboardNavigation->setDefaultFocus(msgbox->mMainWidget, msgbox->getDefaultKeyFocus());
+            }
+        }
+
         if (!mCurrentModals.empty())
             mCurrentModals.back()->onFrame(frameDuration);
 

From 36843ed31e6abc75b5d11d9f830c43de9332f2a0 Mon Sep 17 00:00:00 2001
From: Thunderforge <wjherrmann@gmail.com>
Date: Mon, 15 Jan 2018 00:51:57 -0600
Subject: [PATCH 18/29] Adding a tutorial for placing the ring in plain sight
 (#1598)

* Rearranging sections

* Adding instructions to place the ring in plain sight
---
 docs/source/manuals/openmw-cs/tour.rst | 124 +++++++++++++++----------
 1 file changed, 77 insertions(+), 47 deletions(-)

diff --git a/docs/source/manuals/openmw-cs/tour.rst b/docs/source/manuals/openmw-cs/tour.rst
index 38915c95b..645c18453 100644
--- a/docs/source/manuals/openmw-cs/tour.rst
+++ b/docs/source/manuals/openmw-cs/tour.rst
@@ -211,15 +211,11 @@ Adding the ring to the game's world
 
 Now that we have defined the ring it is time add it to the game world so the
 player can find it legitimately. We will add the ring to a merchant, place it
-in a chest and put it somewhere in plain sight. To this end we will have to
+in a chest, and put it somewhere in plain sight. To this end we will have to
 actually modify the contents of the game.
 
-
-Subsection to come...
-=====================
-
-Adding to an npc
-****************
+Adding to an NPC
+================
 
 The simplest way is probably to add it to the inventory of a shopkeeper. 
 An obvious candidate is Arrille in Seyda Neen - he's quick to find in a new game
@@ -258,6 +254,79 @@ to give the ring to the player - the same as used earlier in the console
 .. figure:: _static/images/chapter-1/Ring_to_Fargoth_2.png
    :alt: Editing Fargoth to give ring to player
 
+Placing in a chest
+==================
+
+For this example we will use the small chest intended for lockpick practice,
+located in the Census and Excise Office in Seyda Neen.
+
+First we need the ID of the chest - this can be obtained either by clicking on it in the console
+in the game, or by applying a similar process in the CS -
+
+World/Cells
+
+Select "Seyda Neen, Census and Excise Office"
+
+Right-click and select "View"
+
+Use mouse wheel to zoom in/out, and mouse plus WASD keys to navigate
+
+Click on the small chest
+
+Either way, you should find the ID, which is "chest_small_02_lockprac".
+
+Open the Objects table (World/Objects) and scroll down to find this item.
+
+Alternatively use the Edit/Search facility, selecting ID rather than text,
+enter "lockprac" (without the quotes) into the search box, press "Search",
+which should return two rows, then select the "Container" one rather than the "Instance"
+
+Right-click and "Edit Record".
+
+Right-click the "Content" section and select "Add a row"
+
+Set the Item ID of the new row to be your new ring - simplest way is probably to open the Objects
+table if it's not already open, sort on the "Modified" column which should bring the ring,
+with its status of "Added" to the top, then drag and drop to the chest row.
+
+Increase the Count to 1.
+
+Save the addon, then test to ensure it works - e.g. start a new game and lockpick the chest.
+
+Placing in plain sight
+=====================
+
+Let's hide the Ring of Night vision in the cabin of the [Ancient Shipwreck]
+(http://en.uesp.net/wiki/Morrowind:Ancient_Shipwreck), a derelict vessel
+southeast of Dagon Fel. Open the list of Cells (*World* → *Cells*) and find
+"Ancient Shipwreck, Cabin".
+
+This will open a visualization of the cabin. You can navigate around the scene
+just like you would when playing Morrowind. Use the WASD keys to move forward,
+backwards, and sideways. Click and drag with the left mouse button to change the
+direction you are looking. Navigate to the table in the cabin.
+
+If you've closed the Objects table, reopen it via *World* → *Objects*. Navigate
+to your Ring of Night Vision (you can find it easily if you sort by the "Modified"
+column). Drag the ring from the Objects table onto the table in the Cell view.
+
+Now let's move the ring to the precise location we want. Hover over the ring and
+click the middle mouse button. If you don't have a middle mouse button, you can
+select an alternative command by going to *Edit* → *Preferences…* (Windows, Linux)
+or *OpenMW* → *Preferences…* (macOS). Go to the Key Bindings section and choose
+"Scene" from the dropdown menu. Then click on the button for "Primary Select" and
+choose an alternative binding.
+
+After you have switched to movement mode, you will see several arrows. Clicking
+and dragging them with the right mouse button will allow you to move the object
+in the direction you want.
+
+If you'd like an easy way to test this, you can start OpenMW with the [game
+arguments](https://wiki.openmw.org/index.php?title=Testing)
+`--start="Ancient Shipwreck, Cabin" --skip-menu`. This will place you right in
+the cell and allow you to pick up and equip the ring in order to check that it
+works.
+
 Navigation in the CS
 ====================
 This is probably a suitable place to start talking about how navigation differs from TESCS
@@ -303,43 +372,4 @@ Launch OpenMW and in the launcher under *Data Files* check your addon, if it's n
 already checked. Load a game and make your way to Seyda Neen - or start a new game.
 
 Check whether Arrille has one (or more) for sale, and whether Fargoth give you one
-when you return his healing ring.
-
-Placing in a chest
-******************
-
-For this example we will use the small chest intended for lockpick practice, 
-located in the Census and Excise Office in Seyda Neen.
-
-First we need the ID of the chest - this can be obtained either by clicking on it in the console
-in the game, or by applying a similar process in the CS - 
-
-World/Cells
-
-Select "Seyda Neen, Census and Excise Office"
-
-Right-click and select "View"
-
-Use mouse wheel to zoom in/out, and mouse plus WASD keys to navigate
-
-Click on the small chest
-
-Either way, you should find the ID, which is "chest_small_02_lockprac".
-
-Open the Objects table (World/Objects) and scroll down to find this item.
-
-Alternatively use the Edit/Search facility, selecting ID rather than text, 
-enter "lockprac" (without the quotes) into the search box, press "Search",
-which should return two rows, then select the "Container" one rather than the "Instance"
-
-Right-click and "Edit Record".
-
-Right-click the "Content" section and select "Add a row"
-
-Set the Item ID of the new row to be your new ring - simplest way is probably to open the Objects
-table if it's not already open, sort on the "Modified" column which should bring the ring,
-with its status of "Added" to the top, then drag and drop to the chest row. 
-
-Increase the Count to 1.
-
-Save the addon, then test to ensure it works - e.g. start a new game and lockpick the chest.
+when you return his healing ring.
\ No newline at end of file

From d2121ccd62bacf55c33568f4e9bd7790d8c2da5f Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <whatever@xyz.is>
Date: Sun, 14 Jan 2018 18:14:30 -0500
Subject: [PATCH 19/29] Update android port.

---
 apps/openmw/CMakeLists.txt              | 3 +--
 apps/openmw/android_main.c              | 3 +++
 apps/openmw/main.cpp                    | 4 ++++
 components/sdlutil/sdlcursormanager.cpp | 4 +++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 491394324..e869e2915 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -159,9 +159,8 @@ if (ANDROID)
         dl
         z
         ${OPENSCENEGRAPH_LIBRARIES}
-        ${OSG_PLUGINS}
+        freetype
         jpeg
-        gif
     	png
     )
 endif (ANDROID)
diff --git a/apps/openmw/android_main.c b/apps/openmw/android_main.c
index 8cd69e8f0..344d3e871 100644
--- a/apps/openmw/android_main.c
+++ b/apps/openmw/android_main.c
@@ -1,3 +1,4 @@
+int stderr = 0; // Hack: fix linker error
 
 #ifdef __ANDROID__
 #include "SDL_main.h"
@@ -17,6 +18,8 @@ void releaseArgv();
 int Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls,
         jobject obj) {
 
+    setenv("OPENMW_DECOMPRESS_TEXTURES", "1", 1);
+
     SDL_Android_Init(env, cls);
 
     SDL_SetMainReady();
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index ac891b980..109610b1e 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -290,7 +290,11 @@ private:
 };
 #endif
 
+#ifdef ANDROID
+extern "C" int SDL_main(int argc, char**argv)
+#else
 int main(int argc, char**argv)
+#endif
 {
 #if defined(__APPLE__)
     setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index 411fb3694..c32891e37 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -16,7 +16,7 @@
 
 #include "imagetosurface.hpp"
 
-#ifdef OSG_LIBRARY_STATIC
+#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()
@@ -220,7 +220,9 @@ namespace SDLUtil
 
     void SDLCursorManager::createCursor(const std::string& name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y)
     {
+#ifndef ANDROID
         _createCursorFromResource(name, rotDegrees, image, hotspot_x, hotspot_y);
+#endif
     }
 
     void SDLCursorManager::_createCursorFromResource(const std::string& name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y)

From a0383275211ce4031d44ace7a76768ed28e61f08 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <whatever@xyz.is>
Date: Wed, 17 Jan 2018 23:03:11 -0500
Subject: [PATCH 20/29] SDLCursorManager: fix possibly invalid read when no
 cursor present

On android we have no cursor so I moved the check closer to usage
---
 components/sdlutil/sdlcursormanager.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index c32891e37..65aa2106f 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -203,19 +203,14 @@ namespace SDLUtil
     void SDLCursorManager::cursorChanged(const std::string& name)
     {
         mCurrentCursor = name;
-
-        CursorMap::const_iterator curs_iter = mCursorMap.find(name);
-
-        if(curs_iter != mCursorMap.end())
-        {
-            //we have this cursor
-            _setGUICursor(name);
-        }
+        _setGUICursor(name);
     }
 
     void SDLCursorManager::_setGUICursor(const std::string &name)
     {
-        SDL_SetCursor(mCursorMap.find(name)->second);
+        auto it = mCursorMap.find(name);
+        if (it != mCursorMap.end())
+            SDL_SetCursor(it->second);
     }
 
     void SDLCursorManager::createCursor(const std::string& name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y)

From 455f718394ee490a302ab0997c3c25a39cf73eba Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <whatever@xyz.is>
Date: Wed, 17 Jan 2018 23:14:23 -0500
Subject: [PATCH 21/29] Android: register a virtual controller definition

---
 apps/openmw/android_main.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/android_main.c b/apps/openmw/android_main.c
index 344d3e871..132e8ecf8 100644
--- a/apps/openmw/android_main.c
+++ b/apps/openmw/android_main.c
@@ -1,7 +1,7 @@
 int stderr = 0; // Hack: fix linker error
 
-#ifdef __ANDROID__
 #include "SDL_main.h"
+#include <SDL_gamecontroller.h>
 
 /*******************************************************************************
  Functions called by JNI
@@ -24,6 +24,9 @@ int Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls,
 
     SDL_SetMainReady();
 
+    // On Android, we use a virtual controller with guid="Virtual"
+    SDL_GameControllerAddMapping("5669727475616c000000000000000000,Virtual,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4");
+
     /* Run the application code! */
 
     int status;
@@ -36,5 +39,3 @@ int Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls,
     return status;
 }
 
-#endif /* __ANDROID__ */
-

From 359910762d459a798132e06e4d8a0dba692f8a71 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <whatever@xyz.is>
Date: Thu, 18 Jan 2018 17:11:22 -0500
Subject: [PATCH 22/29] GraphicsWindowSDL2: support setting up GLESv2 context
 for android

---
 components/sdlutil/sdlgraphicswindow.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/components/sdlutil/sdlgraphicswindow.cpp b/components/sdlutil/sdlgraphicswindow.cpp
index c2cf2536e..de82ca850 100644
--- a/components/sdlutil/sdlgraphicswindow.cpp
+++ b/components/sdlutil/sdlgraphicswindow.cpp
@@ -92,9 +92,18 @@ void GraphicsWindowSDL2::init()
     SDL_GLContext oldCtx = SDL_GL_GetCurrentContext();
    
 #if defined(OPENGL_ES) || defined(ANDROID)
-     SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
-     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
-     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);    
+    int major = 1;
+    int minor = 1;
+    char *ver = getenv("OPENMW_GLES_VERSION");
+
+    if (ver && strcmp(ver, "2") == 0) {
+        major = 2;
+        minor = 0;
+    }
+
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, major);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minor);
 #endif
     
     mContext = SDL_GL_CreateContext(mWindow);

From 8d44d3124e714f4c53fb71e6111b09c990b85238 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <whatever@xyz.is>
Date: Thu, 18 Jan 2018 21:18:31 -0500
Subject: [PATCH 23/29] Android: Add callbacks for basic cursor handling.

---
 apps/openmw/android_main.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/apps/openmw/android_main.c b/apps/openmw/android_main.c
index 132e8ecf8..3f28afa1b 100644
--- a/apps/openmw/android_main.c
+++ b/apps/openmw/android_main.c
@@ -2,6 +2,8 @@ int stderr = 0; // Hack: fix linker error
 
 #include "SDL_main.h"
 #include <SDL_gamecontroller.h>
+#include <SDL_mouse.h>
+#include <SDL_events.h>
 
 /*******************************************************************************
  Functions called by JNI
@@ -15,6 +17,25 @@ extern int argcData;
 extern const char **argvData;
 void releaseArgv();
 
+
+int Java_org_libsdl_app_SDLActivity_getMouseX(JNIEnv *env, jclass cls, jobject obj) {
+    int ret = 0;
+    SDL_GetMouseState(&ret, NULL);
+    return ret;
+}
+
+
+int Java_org_libsdl_app_SDLActivity_getMouseY(JNIEnv *env, jclass cls, jobject obj) {
+    int ret = 0;
+    SDL_GetMouseState(NULL, &ret);
+    return ret;
+}
+
+int Java_org_libsdl_app_SDLActivity_isMouseShown(JNIEnv *env, jclass cls, jobject obj) {
+    return SDL_ShowCursor(SDL_QUERY);
+}
+
+
 int Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls,
         jobject obj) {
 

From b4ec8aaf5ef3bb5f344a6a8886124a6d2d0fba28 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <whatever@xyz.is>
Date: Sun, 21 Jan 2018 12:21:22 -0500
Subject: [PATCH 24/29] VideoState::queue_picture: ffmpeg expects a buffer of 4
 pointers in sws_scale

---
 extern/osg-ffmpeg-videoplayer/videostate.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 9fd209d56..35bfca4aa 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -315,9 +315,9 @@ int VideoState::queue_picture(AVFrame *pFrame, double pts)
     vp->pts = pts;
     vp->data.resize((*this->video_st)->codec->width * (*this->video_st)->codec->height * 4);
 
-    uint8_t *dst = &vp->data[0];
+    uint8_t *dst[4] = { &vp->data[0], nullptr, nullptr, nullptr };
     sws_scale(this->sws_context, pFrame->data, pFrame->linesize,
-              0, (*this->video_st)->codec->height, &dst, this->rgbaFrame->linesize);
+              0, (*this->video_st)->codec->height, dst, this->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;

From 9e9f6f31329e360ad675c6d31dd1ae0df99ab510 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <whatever@xyz.is>
Date: Sun, 21 Jan 2018 23:25:54 -0500
Subject: [PATCH 25/29] loadtes3: don't pack() non-POD structs

---
 components/esm/loadtes3.hpp | 50 +++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/components/esm/loadtes3.hpp b/components/esm/loadtes3.hpp
index f2dde4d1f..896936cf5 100644
--- a/components/esm/loadtes3.hpp
+++ b/components/esm/loadtes3.hpp
@@ -13,24 +13,37 @@ namespace ESM
 #pragma pack(push)
 #pragma pack(1)
 
+    struct Data
+    {
+        /* File format version. This is actually a float, the supported
+            versions are 1.2 and 1.3. These correspond to:
+            1.2 = 0x3f99999a and 1.3 = 0x3fa66666
+        */
+        unsigned int version;
+        int type;           // 0=esp, 1=esm, 32=ess (unused)
+        NAME32 author;      // Author's name
+        NAME256 desc;       // File description
+        int records;        // Number of records
+    };
+
+    struct GMDT
+    {
+        float mCurrentHealth;
+        float mMaximumHealth;
+        float mHour;
+        unsigned char unknown1[12];
+        NAME64 mCurrentCell;
+        unsigned char unknown2[4];
+        NAME32 mPlayerName;
+    };
+
+#pragma pack(pop)
+
     /// \brief File header record
     struct Header
     {
         static const int CurrentFormat = 0; // most recent known format
 
-        struct Data
-        {
-            /* File format version. This is actually a float, the supported
-                versions are 1.2 and 1.3. These correspond to:
-                1.2 = 0x3f99999a and 1.3 = 0x3fa66666
-            */
-            unsigned int version;
-            int type;           // 0=esp, 1=esm, 32=ess (unused)
-            NAME32 author;      // Author's name
-            NAME256 desc;       // File description
-            int records;        // Number of records
-        };
-
         // Defines another files (esm or esp) that this file depends upon.
         struct MasterData
         {
@@ -39,16 +52,6 @@ namespace ESM
             int index; // Position of the parent file in the global list of loaded files
         };
 
-        struct GMDT
-        {
-            float mCurrentHealth;
-            float mMaximumHealth;
-            float mHour;
-            unsigned char unknown1[12];
-            NAME64 mCurrentCell;
-            unsigned char unknown2[4];
-            NAME32 mPlayerName;
-        };
         GMDT mGameData; // Used in .ess savegames only
         std::vector<unsigned char> mSCRD; // Used in .ess savegames only, unknown
         std::vector<unsigned char> mSCRS; // Used in .ess savegames only, screenshot
@@ -62,7 +65,6 @@ namespace ESM
         void load (ESMReader &esm);
         void save (ESMWriter &esm);
     };
-#pragma pack(pop)
 
 }
 

From 613adf6b30b33b47a413a1dfa4796bf7cd43724d Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sat, 27 Jan 2018 23:36:25 +0200
Subject: [PATCH 26/29] [General] Update version to 0.6.3

---
 README.md                        | 2 +-
 components/openmw-mp/Version.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 47482b536..86195cb44 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ TES3MP
 
 TES3MP is a project aiming to add multiplayer functionality to [OpenMW](https://github.com/OpenMW/openmw), a free and open source engine recreation of the popular Bethesda Softworks game "The Elder Scrolls III: Morrowind".
 
-* TES3MP version: 0.6.2
+* TES3MP version: 0.6.3
 * OpenMW version: 0.43.0
 * License: GPLv3 (see [LICENSE](https://github.com/TES3MP/openmw-tes3mp/blob/master/LICENSE) for more information)
 
diff --git a/components/openmw-mp/Version.hpp b/components/openmw-mp/Version.hpp
index 708e204cb..423390d16 100644
--- a/components/openmw-mp/Version.hpp
+++ b/components/openmw-mp/Version.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENMW_VERSION_HPP
 #define OPENMW_VERSION_HPP
 
-#define TES3MP_VERSION "0.6.2-hotfixed"
+#define TES3MP_VERSION "0.6.3"
 #define TES3MP_PROTO_VERSION 7
 
 #define TES3MP_DEFAULT_PASSW "SuperPassword"

From 595bc5a152406111a19ee7838770943979fde092 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sun, 28 Jan 2018 05:58:56 +0200
Subject: [PATCH 27/29] [Client] Only send ObjectScale packets when scale
 actually changes

---
 apps/openmw/mwscript/transformationextensions.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index d976d5773..ea0531fea 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -60,8 +60,9 @@ namespace MWScript
                         Send an ID_OBJECT_SCALE every time an object's scale is changed
                         through a script
                     */
-                    if (ptr.isInCell())
+                    if (ptr.isInCell() && (ptr.getCellRef().getScale() != scale))
                     {
+
                         mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
                         worldEvent->reset();
                         worldEvent->addObjectScale(ptr, scale);

From 420dab10e173ebe53ef16ee9794f3d56ee4b5b43 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sun, 28 Jan 2018 17:00:14 +0200
Subject: [PATCH 28/29] [General] Track objects directly placed by players in
 ObjectPlace

This allows the OnPCDrop variable to get set correctly even when object placements have to go through the server first in order to gain a unique multiplayer index (mpNum).

Among other things, this makes it possible to roll marijuana joints in the popular mod "Tribunal Code Patch".
---
 apps/openmw-mp/Script/Functions/World.cpp            |  1 +
 apps/openmw/mwbase/world.hpp                         | 11 +++++++++++
 apps/openmw/mwgui/hud.cpp                            |  2 +-
 apps/openmw/mwmp/WorldEvent.cpp                      | 12 +++++++++---
 apps/openmw/mwmp/WorldEvent.hpp                      |  2 +-
 apps/openmw/mwworld/worldimp.hpp                     | 12 +++++++++++-
 components/openmw-mp/Base/BaseEvent.hpp              |  1 +
 .../openmw-mp/Packets/World/PacketObjectPlace.cpp    |  1 +
 8 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/apps/openmw-mp/Script/Functions/World.cpp b/apps/openmw-mp/Script/Functions/World.cpp
index 4423d1d05..1fbbf297e 100644
--- a/apps/openmw-mp/Script/Functions/World.cpp
+++ b/apps/openmw-mp/Script/Functions/World.cpp
@@ -289,6 +289,7 @@ void WorldFunctions::SetContainerItemEnchantmentCharge(double enchantmentCharge)
 
 void WorldFunctions::AddWorldObject() noexcept
 {
+    tempWorldObject.droppedByPlayer = false;
     writeEvent.worldObjects.push_back(tempWorldObject);
 
     tempWorldObject = emptyWorldObject;
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 222199211..bc4beda7c 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -249,6 +249,17 @@ namespace MWBase
             virtual MWWorld::Ptr  getFacedObject() = 0;
             ///< Return pointer to the object the player is looking at, if it is within activation range
 
+            /*
+                Start of tes3mp addition
+
+                This has been declared here so it can be accessed from places
+                other than MWWorld::World 
+            */
+            virtual void PCDropped(const MWWorld::Ptr& item) = 0;
+            /*
+                End of tes3mp addition
+            */
+
             virtual float getDistanceToFacedObject() = 0;
 
             virtual float getMaxActivationDistance() = 0;
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 0b34141c2..1bf0b7984 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -74,7 +74,7 @@ namespace MWGui
             */
             mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
             worldEvent->reset();
-            worldEvent->addObjectPlace(dropped);
+            worldEvent->addObjectPlace(dropped, true);
             worldEvent->sendObjectPlace();
             /*
                 End of tes3mp addition
diff --git a/apps/openmw/mwmp/WorldEvent.cpp b/apps/openmw/mwmp/WorldEvent.cpp
index 3ba14ef2b..5ad38bf87 100644
--- a/apps/openmw/mwmp/WorldEvent.cpp
+++ b/apps/openmw/mwmp/WorldEvent.cpp
@@ -158,6 +158,8 @@ void WorldEvent::editContainers(MWWorld::CellStore* cellStore)
 
 void WorldEvent::placeObjects(MWWorld::CellStore* cellStore)
 {
+    MWBase::World *world = MWBase::Environment::get().getWorld();
+
     for (const auto &worldObject : worldObjects)
     {
         LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, %i, %i, count: %i, charge: %i, enchantmentCharge: %i", worldObject.refId.c_str(),
@@ -172,7 +174,7 @@ void WorldEvent::placeObjects(MWWorld::CellStore* cellStore)
         // Only create this object if it doesn't already exist
         if (!ptrFound)
         {
-            MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), worldObject.refId, 1);
+            MWWorld::ManualRef ref(world->getStore(), worldObject.refId, 1);
             MWWorld::Ptr newPtr = ref.getPtr();
 
             if (worldObject.count > 1)
@@ -185,10 +187,13 @@ void WorldEvent::placeObjects(MWWorld::CellStore* cellStore)
                 newPtr.getCellRef().setEnchantmentCharge(worldObject.enchantmentCharge);
 
             newPtr.getCellRef().setGoldValue(worldObject.goldValue);
-            newPtr = MWBase::Environment::get().getWorld()->placeObject(newPtr, cellStore, worldObject.position);
+            newPtr = world->placeObject(newPtr, cellStore, worldObject.position);
 
             // Because gold automatically gets replaced with a new object, make sure we set the mpNum at the end
             newPtr.getCellRef().setMpNum(worldObject.mpNum);
+
+            if (guid == Main::get().getLocalPlayer()->guid && worldObject.droppedByPlayer)
+                world->PCDropped(newPtr);
         }
         else
             LOG_APPEND(Log::LOG_VERBOSE, "-- Object already existed!");
@@ -608,7 +613,7 @@ void WorldEvent::playVideo()
     }
 }
 
-void WorldEvent::addObjectPlace(const MWWorld::Ptr& ptr)
+void WorldEvent::addObjectPlace(const MWWorld::Ptr& ptr, bool droppedByPlayer)
 {
     if (ptr.getCellRef().getRefId().find("$dynamic") != string::npos)
     {
@@ -624,6 +629,7 @@ void WorldEvent::addObjectPlace(const MWWorld::Ptr& ptr)
     worldObject.mpNum = 0;
     worldObject.charge = ptr.getCellRef().getCharge();
     worldObject.enchantmentCharge = ptr.getCellRef().getEnchantmentCharge();
+    worldObject.droppedByPlayer = droppedByPlayer;
 
     // Make sure we send the RefData position instead of the CellRef one, because that's what
     // we actually see on this client
diff --git a/apps/openmw/mwmp/WorldEvent.hpp b/apps/openmw/mwmp/WorldEvent.hpp
index a9b1b4429..783744b24 100644
--- a/apps/openmw/mwmp/WorldEvent.hpp
+++ b/apps/openmw/mwmp/WorldEvent.hpp
@@ -41,7 +41,7 @@ namespace mwmp
         void playMusic();
         void playVideo();
 
-        void addObjectPlace(const MWWorld::Ptr& ptr);
+        void addObjectPlace(const MWWorld::Ptr& ptr, bool droppedByPlayer = false);
         void addObjectSpawn(const MWWorld::Ptr& ptr);
         void addObjectSpawn(const MWWorld::Ptr& ptr, const MWWorld::Ptr& master);
         void addObjectDelete(const MWWorld::Ptr& ptr);
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index f3728a29d..229ad2da8 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -136,11 +136,21 @@ namespace MWWorld
 
             MWWorld::Ptr getFacedObject(float maxDistance, bool ignorePlayer=true);
 
+            /*
+                Start of tes3mp change (major)
+
+                This has been turned into a public method so it can be used in
+                multiplayer's different approach to placing items
+            */
+            void PCDropped(const Ptr& item);
+            /*
+                End of tes3mp change (major)
+            */
+
     public: // FIXME
             void removeContainerScripts(const Ptr& reference) override;
     private:
             void addContainerScripts(const Ptr& reference, CellStore* cell);
-            void PCDropped (const Ptr& item);
 
             void processDoors(float duration);
             ///< Run physics simulation and modify \a world accordingly.
diff --git a/components/openmw-mp/Base/BaseEvent.hpp b/components/openmw-mp/Base/BaseEvent.hpp
index 081f189c0..0bed7eb6c 100644
--- a/components/openmw-mp/Base/BaseEvent.hpp
+++ b/components/openmw-mp/Base/BaseEvent.hpp
@@ -51,6 +51,7 @@ namespace mwmp
         std::string varName;
 
         bool isDisarmed;
+        bool droppedByPlayer;
 
         Target master;
         bool hasMaster;
diff --git a/components/openmw-mp/Packets/World/PacketObjectPlace.cpp b/components/openmw-mp/Packets/World/PacketObjectPlace.cpp
index 031913074..17657dfb6 100644
--- a/components/openmw-mp/Packets/World/PacketObjectPlace.cpp
+++ b/components/openmw-mp/Packets/World/PacketObjectPlace.cpp
@@ -17,4 +17,5 @@ void PacketObjectPlace::Object(WorldObject &worldObject, bool send)
     RW(worldObject.enchantmentCharge, send);
     RW(worldObject.goldValue, send);
     RW(worldObject.position, send);
+    RW(worldObject.droppedByPlayer, send);
 }

From ce11a1dfa91a184d4c641f0060dbaafceaa77ee5 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sun, 28 Jan 2018 21:19:03 +0200
Subject: [PATCH 29/29] [Client] Fix potential invalid pointer when storing
 cell unloads

Notably, builds of the client done with Clang were crashing on startup before this.
---
 apps/openmw/mwmp/LocalPlayer.cpp |  2 +-
 apps/openmw/mwmp/LocalPlayer.hpp |  2 +-
 apps/openmw/mwworld/scene.cpp    | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp
index 5973ffea3..56a426807 100644
--- a/apps/openmw/mwmp/LocalPlayer.cpp
+++ b/apps/openmw/mwmp/LocalPlayer.cpp
@@ -1544,7 +1544,7 @@ void LocalPlayer::clearCurrentContainer()
     currentContainer.mpNum = 0;
 }
 
-void LocalPlayer::storeCellState(ESM::Cell cell, int stateType)
+void LocalPlayer::storeCellState(const ESM::Cell& cell, int stateType)
 {
     std::vector<CellState>::iterator iter;
 
diff --git a/apps/openmw/mwmp/LocalPlayer.hpp b/apps/openmw/mwmp/LocalPlayer.hpp
index 6f1dc9e07..1900b07b4 100644
--- a/apps/openmw/mwmp/LocalPlayer.hpp
+++ b/apps/openmw/mwmp/LocalPlayer.hpp
@@ -91,7 +91,7 @@ namespace mwmp
         void clearCellStates();
         void clearCurrentContainer();
 
-        void storeCellState(ESM::Cell cell, int stateType);
+        void storeCellState(const ESM::Cell& cell, int stateType);
         void storeCurrentContainer(const MWWorld::Ptr& container);
 
         void playAnimation();
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 35161dca2..58e6200a7 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -243,6 +243,17 @@ namespace MWWorld
         std::cout << "Unloading cell\n";
         ListAndResetObjectsVisitor visitor;
 
+        /*
+            Start of tes3mp addition
+
+            Set a const pointer to the iterator's ESM::Cell here, because
+            (*iter)->getCell() can become invalid later down
+        */
+        const ESM::Cell* cell = (*iter)->getCell();
+        /*
+            End of tes3mp addition
+        */
+
         (*iter)->forEach<ListAndResetObjectsVisitor>(visitor);
         for (std::vector<MWWorld::Ptr>::const_iterator iter2 (visitor.mObjects.begin());
             iter2!=visitor.mObjects.end(); ++iter2)
@@ -276,7 +287,7 @@ namespace MWWorld
 
             Store a cell unload for the LocalPlayer
         */
-        mwmp::Main::get().getLocalPlayer()->storeCellState(*(*iter)->getCell(), mwmp::CellState::UNLOAD);
+        mwmp::Main::get().getLocalPlayer()->storeCellState(*cell, mwmp::CellState::UNLOAD);
         /*
             End of tes3mp addition
         */