From 00bf87b5611d7dbc8fc8e7d5add1a4a236071733 Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Thu, 9 Jul 2015 15:17:38 +0300
Subject: [PATCH] Convert IDs of loaded records to lower case in MWWorld::Store

---
 apps/openmw/mwworld/store.hpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index a61cbd2ac1..c482486d8e 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -217,9 +217,9 @@ namespace MWWorld
         void load(ESM::ESMReader &esm) {
             T record;
             record.load(esm);
+            Misc::StringUtils::toLower(record.mId);
 
-            std::string idLower = Misc::StringUtils::lowerCase(record.mId);
-            std::pair<typename Static::iterator, bool> inserted = mStatic.insert(std::make_pair(idLower, record));
+            std::pair<typename Static::iterator, bool> inserted = mStatic.insert(std::make_pair(record.mId, record));
             if (inserted.second)
                 mShared.push_back(&inserted.first->second);
 
@@ -359,6 +359,7 @@ namespace MWWorld
 
     template <>
     inline void Store<ESM::Dialogue>::load(ESM::ESMReader &esm) {
+        // The original letter case of a dialogue ID is saved, because it's printed
         ESM::Dialogue dialogue;
         dialogue.load(esm);
 
@@ -380,9 +381,9 @@ namespace MWWorld
     inline void Store<ESM::Script>::load(ESM::ESMReader &esm) {
         ESM::Script script;
         script.load(esm);
+        Misc::StringUtils::toLower(script.mId);
 
-        std::string idLower = Misc::StringUtils::toLower(script.mId);
-        std::pair<typename Static::iterator, bool> inserted = mStatic.insert(std::make_pair(idLower, script));
+        std::pair<typename Static::iterator, bool> inserted = mStatic.insert(std::make_pair(script.mId, script));
         if (inserted.second)
             mShared.push_back(&inserted.first->second);
         else
@@ -396,9 +397,9 @@ namespace MWWorld
     {
         ESM::StartScript script;
         script.load(esm);
+        Misc::StringUtils::toLower(script.mId);
 
-        std::string idLower = Misc::StringUtils::toLower(script.mId);
-        std::pair<typename Static::iterator, bool> inserted = mStatic.insert(std::make_pair(idLower, script));
+        std::pair<typename Static::iterator, bool> inserted = mStatic.insert(std::make_pair(script.mId, script));
         if (inserted.second)
             mShared.push_back(&inserted.first->second);
         else