games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Replaced vstd clamp with std version

Browse Source
This commit is contained in:
Ivan Savenko
2023-04-11 01:00:46 +03:00
parent 5f74aca341
commit 506c3d29bc
11 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mapView/MapViewController.cpp
View File

@ -58,10 +58,10 @@ void MapViewController::setViewCenter(const Point & position, int level)
lowerLimit = actualLowerLimit;
}
Point betterPosition = {vstd::clamp(position.x, lowerLimit.x, upperLimit.x), vstd::clamp(position.y, lowerLimit.y, upperLimit.y)};
Point betterPosition = {std::clamp(position.x, lowerLimit.x, upperLimit.x), std::clamp(position.y, lowerLimit.y, upperLimit.y)};
model->setViewCenter(betterPosition);
model->setLevel(vstd::clamp(level, 0, context->getMapSize().z));
model->setLevel(std::clamp(level, 0, context->getMapSize().z));
if(adventureInt) // may be called before adventureInt is initialized
adventureInt->onMapViewMoved(model->getTilesTotalRect(), model->getLevel());