diff --git a/apps/openmw/mwrender/landmanager.cpp b/apps/openmw/mwrender/landmanager.cpp index 63ced5d12c..0358a9d411 100644 --- a/apps/openmw/mwrender/landmanager.cpp +++ b/apps/openmw/mwrender/landmanager.cpp @@ -19,8 +19,8 @@ namespace MWRender osg::ref_ptr LandManager::getLand(ESM::ExteriorCellLocation cellIndex) { - osg::ref_ptr obj = mCache->getRefFromObjectCache(cellIndex); - if (obj) + const osg::ref_ptr obj = mCache->getRefFromObjectCache(cellIndex); + if (obj != nullptr) return static_cast(obj.get()); else { @@ -29,7 +29,7 @@ namespace MWRender if (ESM::isEsm4Ext(cellIndex.mWorldspace)) { const ESM4::Land* land = world.getStore().get().search(cellIndex); - if (!land) + if (land == nullptr) return nullptr; osg::ref_ptr landObj(new ESMTerrain::LandObject(*land, mLoadFlags)); mCache->addEntryToObjectCache(cellIndex, landObj.get()); @@ -38,7 +38,7 @@ namespace MWRender else { const ESM::Land* land = world.getStore().get().search(cellIndex.mX, cellIndex.mY); - if (!land) + if (land == nullptr) return nullptr; osg::ref_ptr landObj(new ESMTerrain::LandObject(*land, mLoadFlags)); mCache->addEntryToObjectCache(cellIndex, landObj.get());