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

Avoid implicit cast to bool for pointers

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

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

@ -19,8 +19,8 @@ namespace MWRender
osg::ref_ptr<ESMTerrain::LandObject> LandManager::getLand(ESM::ExteriorCellLocation cellIndex)
{
osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(cellIndex);
if (obj)
const osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(cellIndex);
if (obj != nullptr)
return static_cast<ESMTerrain::LandObject*>(obj.get());
else
{
@ -29,7 +29,7 @@ namespace MWRender
if (ESM::isEsm4Ext(cellIndex.mWorldspace))
{
const ESM4::Land* land = world.getStore().get<ESM4::Land>().search(cellIndex);
if (!land)
if (land == nullptr)
return nullptr;
osg::ref_ptr<ESMTerrain::LandObject> 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<ESM::Land>().search(cellIndex.mX, cellIndex.mY);
if (!land)
if (land == nullptr)
return nullptr;
osg::ref_ptr<ESMTerrain::LandObject> landObj(new ESMTerrain::LandObject(*land, mLoadFlags));
mCache->addEntryToObjectCache(cellIndex, landObj.get());