mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-07 02:15:33 +00:00
Code Issues Releases Wiki Activity

Reduce block nesting

Browse source
This commit is contained in:
elsid 2023-05-10 20:10:05 +02:00
parent 54a79cfc39
commit 624ffef4fe
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
apps/openmw/mwrender/localmap.cpp
View file

@ -182,22 +182,20 @@ namespace MWRender
void LocalMap::requestMap(const MWWorld::CellStore* cell) 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); 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) void LocalMap::addCell(MWWorld::CellStore* cell)
@ -272,13 +270,14 @@ namespace MWRender
MapSegment& segment MapSegment& segment
= mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())]; = mExteriorSegments[std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY())];
if (!segment.mFogOfWarImage)
{ if (segment.mFogOfWarImage != nullptr)
if (cell->getFog()) return;
segment.loadFogOfWar(cell->getFog()->mFogTextures.back());
else if (cell->getFog())
segment.initFogOfWar(); segment.loadFogOfWar(cell->getFog()->mFogTextures.back());
} else
segment.initFogOfWar();
} }
static osg::Vec2f getNorthVector(const MWWorld::CellStore* cell) static osg::Vec2f getNorthVector(const MWWorld::CellStore* cell)