From 624ffef4fea88e4f5ddba8b3b9504094a0a75392 Mon Sep 17 00:00:00 2001 From: elsid Date: Wed, 10 May 2023 20:10:05 +0200 Subject: [PATCH] Reduce block nesting --- apps/openmw/mwrender/localmap.cpp | 41 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp index f9c7e02e44..929b46ee8d 100644 --- a/apps/openmw/mwrender/localmap.cpp +++ b/apps/openmw/mwrender/localmap.cpp @@ -182,22 +182,20 @@ namespace MWRender void LocalMap::requestMap(const MWWorld::CellStore* cell) { - if (cell->isExterior()) + if (!cell->isExterior()) { - int cellX = cell->getCell()->getGridX(); - int cellY = cell->getCell()->getGridY(); - - MapSegment& segment = mExteriorSegments[std::make_pair(cellX, cellY)]; - if (!segment.needUpdate) - return; - else - { - requestExteriorMap(cell); - segment.needUpdate = false; - } - } - else requestInteriorMap(cell); + return; + } + + int cellX = cell->getCell()->getGridX(); + int cellY = cell->getCell()->getGridY(); + + MapSegment& segment = mExteriorSegments[std::make_pair(cellX, cellY)]; + if (!segment.needUpdate) + return; + requestExteriorMap(cell); + segment.needUpdate = false; } void LocalMap::addCell(MWWorld::CellStore* cell) @@ -272,13 +270,14 @@ namespace MWRender MapSegment& segment = mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())]; - if (!segment.mFogOfWarImage) - { - if (cell->getFog()) - segment.loadFogOfWar(cell->getFog()->mFogTextures.back()); - else - segment.initFogOfWar(); - } + + if (segment.mFogOfWarImage != nullptr) + return; + + if (cell->getFog()) + segment.loadFogOfWar(cell->getFog()->mFogTextures.back()); + else + segment.initFogOfWar(); } static osg::Vec2f getNorthVector(const MWWorld::CellStore* cell)