mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-26 23:36:48 +00:00
Code Issues Releases Wiki Activity

Ignore case when comparing textures, also add new textures to lookup map.

Browse source
This commit is contained in:
Kyle Cooley 2017-09-30 00:04:52 -04:00
parent 1fe1ec63c4
commit dfcbee3ab1
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/opencs/model/world/idtable.cpp
View file

@ -1,5 +1,7 @@
#include "idtable.hpp" #include "idtable.hpp"
#include <algorithm>
#include <cctype>
#include <cstdint> #include <cstdint>
#include <limits> #include <limits>
#include <map> #include <map>
@ -346,8 +348,10 @@ CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::import
for (int i = 0; i < idCollection()->getSize(); ++i) for (int i = 0; i < idCollection()->getSize(); ++i)
{ {
auto& record = static_cast<const Record<LandTexture>&>(idCollection()->getRecord(i)); auto& record = static_cast<const Record<LandTexture>&>(idCollection()->getRecord(i));
std::string texture = record.get().mTexture;
std::transform(texture.begin(), texture.end(), texture.begin(), tolower);
if (record.isModified()) if (record.isModified())
reverseLookupMap.emplace(record.get().mTexture, idCollection()->getId(i)); reverseLookupMap.emplace(texture, idCollection()->getId(i));
} }
for (const std::string& id : ids) for (const std::string& id : ids)
@ -366,7 +370,9 @@ CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::import
// Look for a pre-existing record // Look for a pre-existing record
auto& record = static_cast<const Record<LandTexture>&>(idCollection()->getRecord(oldRow)); auto& record = static_cast<const Record<LandTexture>&>(idCollection()->getRecord(oldRow));
auto searchIt = reverseLookupMap.find(record.get().mTexture); std::string texture = record.get().mTexture;
std::transform(texture.begin(), texture.end(), texture.begin(), tolower);
auto searchIt = reverseLookupMap.find(texture);
if (searchIt != reverseLookupMap.end()) if (searchIt != reverseLookupMap.end())
{ {
results.recordMapping.push_back(std::make_pair(id, searchIt->second)); results.recordMapping.push_back(std::make_pair(id, searchIt->second));
@ -385,6 +391,7 @@ CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::import
cloneRecord(id, newId, UniversalId::Type_LandTexture); cloneRecord(id, newId, UniversalId::Type_LandTexture);
results.createdRecords.push_back(newId); results.createdRecords.push_back(newId);
results.recordMapping.push_back(std::make_pair(id, newId)); results.recordMapping.push_back(std::make_pair(id, newId));
reverseLookupMap.emplace(texture, newId);
break; break;
} }