mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-15 23:42:20 +00:00
Code Issues Projects Releases Wiki Activity

Convert IDs of loaded records to lower case in MWWorld::Store

Browse Source 
(cherry picked from commit 00bf87b5611d7dbc8fc8e7d5add1a4a236071733)
This commit is contained in:
Stanislav Bas 2015-07-09 15:17:38 +03:00 committed by cc9cii
parent f8b0cfc637
commit a46ea70d65
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/openmw/mwworld/store.hpp
View File

@ -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