mirror of
https://github.com/OpenMW/openmw.git
synced 2026-01-11 09:10:54 +00:00
Merge branch 'unused_var_really' into 'master'
heightfield not used See merge request OpenMW/openmw!5084
This commit is contained in:
commit
bc45d17a56
1 changed files with 2 additions and 2 deletions
|
|
@ -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 (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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue