Merge remote-tracking branch 'scrawl/master'

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;

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;
             }

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 ();

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;
+            for (boost::filesystem::directory_iterator iter2 (*iter);
-            if (boost::filesystem::exists(path))
+                iter2!=boost::filesystem::directory_iterator(); ++iter2)
-                return path.string();
+            {
+                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;
+            for (boost::filesystem::directory_iterator iter2 (*iter);
-            if (boost::filesystem::exists(path))
+                iter2!=boost::filesystem::directory_iterator(); ++iter2)
-                return true;
+            {
+                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;

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>