1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-17 19:20:49 +00:00

Merge branch 'knightofzero' into 'master'

Fix local map viewing distance lower bound (regression #6902)

Closes #6902

See merge request OpenMW/openmw!2186
This commit is contained in:
AnyOldName3 2022-07-26 01:17:14 +00:00
commit 0a73724fbd

View File

@ -104,7 +104,7 @@ namespace
return Constants::CellGridRadius;
const int maxLocalViewingDistance = std::max(Settings::Manager::getInt("max local viewing distance", "Map"), Constants::CellGridRadius);
const int viewingDistanceInCells = Settings::Manager::getFloat("viewing distance", "Camera") / Constants::CellSizeInUnits;
return std::min(maxLocalViewingDistance, viewingDistanceInCells);
return std::clamp(viewingDistanceInCells, Constants::CellGridRadius, maxLocalViewingDistance);
}
}