mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 16:54:52 +01:00
Code Issues Releases Wiki Activity

Remove Math::Clamp in favour of std::clamp

Browse Source
This commit is contained in:
Linus Unnebäck
2018-08-12 12:50:40 +01:00
parent 54fe6a7590
commit fd07be587a
101 changed files with 248 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/world/Footpath.cpp
View File

@@ -13,7 +13,6 @@
#include "../OpenRCT2.h"
#include "../actions/FootpathRemoveAction.hpp"
#include "../core/Guard.hpp"
#include "../core/Math.hpp"
#include "../core/Util.hpp"
#include "../localisation/Localisation.h"
#include "../management/Finance.h"
@@ -31,6 +30,8 @@
#include "Sprite.h"
#include "Surface.h"
#include <algorithm>
void footpath_update_queue_entrance_banner(int32_t x, int32_t y, rct_tile_element* tileElement);
uint8_t gFootpathProvisionalFlags;
@@ -858,8 +859,8 @@ void footpath_get_coordinates_from_pos(
z = tile_element_height(position.x, position.y);
}
position = viewport_coord_to_map_coord(start_vp_pos.x, start_vp_pos.y, z);
position.x = Math::Clamp(minPosition.x, position.x, maxPosition.x);
position.y = Math::Clamp(minPosition.y, position.y, maxPosition.y);
position.x = std::clamp(position.x, minPosition.x, maxPosition.x);
position.y = std::clamp(position.y, minPosition.y, maxPosition.y);
}
// Determine to which edge the cursor is closest