Skip to content

Commit bc45d17

Browse files
committed
Merge branch 'unused_var_really' into 'master'
heightfield not used See merge request OpenMW/openmw!5084
2 parents f0e31e6 + 0dad5dd commit bc45d17

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

apps/openmw/mwworld/scene.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ namespace MWWorld
457457
mPhysics->addHeightField(defaultHeight.data(), cellX, cellY, worldsize, verts,
458458
ESM::Land::DEFAULT_HEIGHT, ESM::Land::DEFAULT_HEIGHT, land.get());
459459
}
460-
if (const auto heightField = mPhysics->getHeightField(cellX, cellY))
460+
if (mPhysics->getHeightField(cellX, cellY))
461461
{
462462
const osg::Vec2i cellPosition(cellX, cellY);
463463
const HeightfieldShape shape = [&]() -> HeightfieldShape {
@@ -510,7 +510,7 @@ namespace MWWorld
510510

511511
if (cellVariant.isExterior())
512512
{
513-
if (mPhysics->getHeightField(cellX, cellY) != nullptr)
513+
if (mPhysics->getHeightField(cellX, cellY))
514514
mNavigator.addWater(
515515
osg::Vec2i(cellX, cellY), ESM::Land::REAL_SIZE, waterLevel, navigatorUpdateGuard);
516516
}

0 commit comments

Comments
 (0)