From 4c0506777e4a5ff01eba1f61b5aa227cb304711e Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Tue, 6 Jan 2026 12:41:55 +0100 Subject: [PATCH 1/3] maybe_unused_yes_it_is --- apps/openmw/mwworld/scene.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index a7b9179839..35d789de97 100644 --- 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 (const auto heightField = mPhysics->getHeightField(cellX, cellY)) + if ([[maybe_unused]] const auto heightField = mPhysics->getHeightField(cellX, cellY)) { const osg::Vec2i cellPosition(cellX, cellY); const HeightfieldShape shape = [&]() -> HeightfieldShape { From cf9a5e9bada16cfc0411d829f81916a88b9fde28 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Tue, 6 Jan 2026 18:29:50 +0100 Subject: [PATCH 2/3] just nullptr check, no unused for you --- apps/openmw/mwworld/scene.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index 35d789de97..843cb1fc37 100644 --- 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 ([[maybe_unused]] const auto heightField = mPhysics->getHeightField(cellX, cellY)) + if (mPhysics->getHeightField(cellX, cellY) != nullptr) { const osg::Vec2i cellPosition(cellX, cellY); const HeightfieldShape shape = [&]() -> HeightfieldShape { From 0dad5dd4e9586eb14f0d1f750ad2b21f26c8b7d8 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 9 Jan 2026 12:02:46 +0100 Subject: [PATCH 3/3] do not do a explicit nullptr check per aon3 request --- apps/openmw/mwworld/scene.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index 843cb1fc37..82958b0548 100644 --- 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); }