From bfd91c0681ee766256a0295a2c3f8b0502397167 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 26 May 2014 12:31:08 +0200
Subject: [PATCH 1/3] Fix potential NpcStats overwriting issue

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

diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 24e758e32e..d50f2c5ae4 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -496,10 +496,10 @@ void MWMechanics::NpcStats::readState (const ESM::NpcStats& state)
                 mExpelled.insert (iter->first);
 
             if (iter->second.mRank >= 0)
-                mFactionRank.insert (std::make_pair (iter->first, iter->second.mRank));
+                mFactionRank[iter->first] = iter->second.mRank;
 
             if (iter->second.mReputation)
-                mFactionReputation.insert (std::make_pair (iter->first, iter->second.mReputation));
+                mFactionReputation[iter->first] = iter->second.mReputation;
         }
 
     mDisposition = state.mDisposition;

From f629307f6050e69cfa295cee59ffbb00b9656591 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 26 May 2014 16:43:19 +0200
Subject: [PATCH 2/3] Fix frame delay for sound listener position (Fixes #1180)

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

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 727b200f57..43153612d7 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1375,11 +1375,11 @@ namespace MWWorld
 
         updateWeather(duration);
 
-        mWorldScene->update (duration, paused);
-
         if (!paused)
             doPhysics (duration);
 
+        mWorldScene->update (duration, paused);
+
         performUpdateSceneQueries ();
 
         updateWindowManager ();

From 3cd835e61a4a2e1b8e9d28fee5fa1a570459a96d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 26 May 2014 17:34:36 +0200
Subject: [PATCH 3/3] Fix bsa file loading not being case insensitive (Fixes
 #1178)

---
 apps/openmw/mwworld/esmstore.cpp          |  2 +-
 components/files/collections.cpp          | 35 ++++++++++++++++++-----
 files/mygui/openmw_settings_window.layout |  2 +-
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 1fdf3c5a50..fc2bd4d773 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -42,7 +42,7 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
         for (int i = 0; i < esm.getIndex(); i++) {
             const std::string &candidate = allPlugins->at(i).getContext().filename;
             std::string fnamecandidate = boost::filesystem::path(candidate).filename().string();
-            if (fname == fnamecandidate) {
+            if (Misc::StringUtils::ciEqual(fname, fnamecandidate)) {
                 index = i;
                 break;
             }
diff --git a/components/files/collections.cpp b/components/files/collections.cpp
index c6195d88cf..a933eb682c 100644
--- a/components/files/collections.cpp
+++ b/components/files/collections.cpp
@@ -1,6 +1,7 @@
-
 #include "collections.hpp"
 
+#include <components/misc/stringops.hpp>
+
 namespace Files
 {
     Collections::Collections()
@@ -36,9 +37,19 @@ namespace Files
         for (Files::PathContainer::const_iterator iter = mDirectories.begin();
              iter != mDirectories.end(); ++iter)
         {
-            const boost::filesystem::path path = *iter / file;
-            if (boost::filesystem::exists(path))
-                return path.string();
+            for (boost::filesystem::directory_iterator iter2 (*iter);
+                iter2!=boost::filesystem::directory_iterator(); ++iter2)
+            {
+                boost::filesystem::path path = *iter2;
+
+                if (mFoldCase)
+                {
+                    if (Misc::StringUtils::ciEqual(file, path.filename().string()))
+                        return path.string();
+                }
+                else if (path.filename().string() == file)
+                    return path.string();
+            }
         }
 
         throw std::runtime_error ("file " + file + " not found");
@@ -49,9 +60,19 @@ namespace Files
         for (Files::PathContainer::const_iterator iter = mDirectories.begin();
              iter != mDirectories.end(); ++iter)
         {
-            const boost::filesystem::path path = *iter / file;
-            if (boost::filesystem::exists(path))
-                return true;
+            for (boost::filesystem::directory_iterator iter2 (*iter);
+                iter2!=boost::filesystem::directory_iterator(); ++iter2)
+            {
+                boost::filesystem::path path = *iter2;
+
+                if (mFoldCase)
+                {
+                    if (Misc::StringUtils::ciEqual(file, path.filename().string()))
+                        return true;
+                }
+                else if (path.filename().string() == file)
+                    return true;
+            }
         }
 
         return false;
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 6119ab7b4d..9ecae465c6 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -417,7 +417,7 @@
                                 <UserString key="SettingType" value="CheckButton"/>
                             </Widget>
                             <Widget type="AutoSizedTextBox" skin="SandText" align="Left Top">
-                                <Property key="Caption" value="Enabled"/>
+                                <Property key="Caption" value="Shadows"/>
                             </Widget>
                         </Widget>