do not do a explicit nullptr check per aon3 request

psi29a · psi29a · commit 0dad5dd4e958 · 2026-01-09T12:02:46.000+01:00
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
@@ -457,7 +457,7 @@ namespace MWWorld
                 mPhysics->addHeightField(defaultHeight.data(), cellX, cellY, worldsize, verts,
                     ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
             }
-            if (mPhysics->getHeightField(cellX, cellY) != nullptr)
+            if (mPhysics->getHeightField(cellX, cellY))
             {
                 const osg::Vec2i cellPosition(cellX, cellY);
                 const HeightfieldShape shape = [&]() -> HeightfieldShape {
@@ -510,7 +510,7 @@ namespace MWWorld
 
             if (cellVariant.isExterior())
             {
-                if (mPhysics->getHeightField(cellX, cellY) != nullptr)
+                if (mPhysics->getHeightField(cellX, cellY))
                     mNavigator.addWater(
                         osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE, waterLevel, navigatorUpdateGuard);
             }

Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,7 @@ namespace MWWorld`
`457`	`457`	`mPhysics->addHeightField(defaultHeight.data(), cellX, cellY, worldsize, verts,`
`458`	`458`	`ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());`
`459`	`459`	`}`
`460`		`- if (mPhysics->getHeightField(cellX, cellY) != nullptr)`
	`460`	`+ if (mPhysics->getHeightField(cellX, cellY))`
`461`	`461`	`{`
`462`	`462`	`const osg::Vec2i cellPosition(cellX, cellY);`
`463`	`463`	`const HeightfieldShape shape = [&]() -> HeightfieldShape {`
`@@ -510,7 +510,7 @@ namespace MWWorld`
`510`	`510`
`511`	`511`	`if (cellVariant.isExterior())`
`512`	`512`	`{`
`513`		`- if (mPhysics->getHeightField(cellX, cellY) != nullptr)`
	`513`	`+ if (mPhysics->getHeightField(cellX, cellY))`
`514`	`514`	`mNavigator.addWater(`
`515`	`515`	`osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE, waterLevel, navigatorUpdateGuard);`
`516`	`516`	`}`