mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-22 18:11:34 +00:00
Code Issues Releases Wiki Activity

Avoid duplicated addEntryToObjectCache call

Browse source
This commit is contained in:
elsid 2023-08-19 01:29:08 +02:00
parent b67ecb4e4f
commit ba1b3ae962
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwrender/landmanager.cpp
View file

@ -24,26 +24,26 @@ namespace MWRender
return static_cast<ESMTerrain::LandObject*>(obj.get()); return static_cast<ESMTerrain::LandObject*>(obj.get());
const MWBase::World& world = *MWBase::Environment::get().getWorld(); const MWBase::World& world = *MWBase::Environment::get().getWorld();
osg::ref_ptr<ESMTerrain::LandObject> landObj = nullptr;
if (ESM::isEsm4Ext(cellIndex.mWorldspace)) if (ESM::isEsm4Ext(cellIndex.mWorldspace))
{ {
const ESM4::Land* land = world.getStore().get<ESM4::Land>().search(cellIndex); const ESM4::Land* land = world.getStore().get<ESM4::Land>().search(cellIndex);
if (land == nullptr) if (land == nullptr)
return nullptr; return nullptr;
osg::ref_ptr<ESMTerrain::LandObject> landObj(new ESMTerrain::LandObject(*land, mLoadFlags)); landObj = new ESMTerrain::LandObject(*land, mLoadFlags);
mCache->addEntryToObjectCache(cellIndex, landObj.get());
return landObj;
} }
else else
{ {
const ESM::Land* land = world.getStore().get<ESM::Land>().search(cellIndex.mX, cellIndex.mY); const ESM::Land* land = world.getStore().get<ESM::Land>().search(cellIndex.mX, cellIndex.mY);
if (land == nullptr) if (land == nullptr)
return nullptr; return nullptr;
osg::ref_ptr<ESMTerrain::LandObject> landObj(new ESMTerrain::LandObject(*land, mLoadFlags)); landObj = new ESMTerrain::LandObject(*land, mLoadFlags);
}
mCache->addEntryToObjectCache(cellIndex, landObj.get()); mCache->addEntryToObjectCache(cellIndex, landObj.get());
return landObj; return landObj;
} }
}
void LandManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const void LandManager::reportStats(unsigned int frameNumber, osg::Stats* stats) const
{ {