mirror of
https://github.com/TES3MP/TES3MP.git
synced 2025-09-27 06:55:54 -04:00
Merge branch 'master' of https://github.com/zinnschlag/openmw
This commit is contained in:
commit
4eb7767f61
@ -129,13 +129,14 @@ MWWorld::Ptr::CellStore *MWWorld::Cells::getExterior (int x, int y)
|
|||||||
|
|
||||||
MWWorld::Ptr::CellStore *MWWorld::Cells::getInterior (const std::string& name)
|
MWWorld::Ptr::CellStore *MWWorld::Cells::getInterior (const std::string& name)
|
||||||
{
|
{
|
||||||
std::map<std::string, Ptr::CellStore>::iterator result = mInteriors.find (name);
|
std::string lowerName = Misc::StringUtils::lowerCase(name);
|
||||||
|
std::map<std::string, Ptr::CellStore>::iterator result = mInteriors.find (lowerName);
|
||||||
|
|
||||||
if (result==mInteriors.end())
|
if (result==mInteriors.end())
|
||||||
{
|
{
|
||||||
const ESM::Cell *cell = mStore.get<ESM::Cell>().find(name);
|
const ESM::Cell *cell = mStore.get<ESM::Cell>().find(lowerName);
|
||||||
|
|
||||||
result = mInteriors.insert (std::make_pair (name, Ptr::CellStore (cell))).first;
|
result = mInteriors.insert (std::make_pair (lowerName, Ptr::CellStore (cell))).first;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result->second.mState!=Ptr::CellStore::State_Loaded)
|
if (result->second.mState!=Ptr::CellStore::State_Loaded)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user