mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 05:09:43 +00:00
Code Issues Releases Wiki Activity

Avoid redundant check for nullptr

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

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

@ -24,13 +24,11 @@ namespace MWRender
return static_cast<ESMTerrain::LandObject*>(obj.get());
else
{
const auto world = MWBase::Environment::get().getWorld();
if (!world)
return nullptr;
const MWBase::World& world = *MWBase::Environment::get().getWorld();
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)
return nullptr;
osg::ref_ptr<ESMTerrain::LandObject> landObj(new ESMTerrain::LandObject(*land, mLoadFlags));
@ -39,7 +37,7 @@ namespace MWRender
}
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)
return nullptr;
osg::ref_ptr<ESMTerrain::LandObject> landObj(new ESMTerrain::LandObject(*land, mLoadFlags));