mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 01:04:50 +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

5
src/openrct2/interface/Viewport.cpp
View File

@@ -14,7 +14,6 @@
#include "../Input.h"
#include "../OpenRCT2.h"
#include "../config/Config.h"
#include "../core/Math.hpp"
#include "../drawing/Drawing.h"
#include "../paint/Paint.h"
#include "../peep/Staff.h"
@@ -1761,8 +1760,8 @@ void screen_get_map_xy(int32_t screenX, int32_t screenY, int16_t* x, int16_t* y,
{
int32_t z = tile_element_height(map_pos.x, map_pos.y);
map_pos = viewport_coord_to_map_coord(start_vp_pos.x, start_vp_pos.y, z);
map_pos.x = Math::Clamp<int16_t>(map_pos.x, my_x, my_x + 31);
map_pos.y = Math::Clamp<int16_t>(map_pos.y, my_y, my_y + 31);
map_pos.x = std::clamp<int16_t>(map_pos.x, my_x, my_x + 31);
map_pos.y = std::clamp<int16_t>(map_pos.y, my_y, my_y + 31);
}
*x = map_pos.x;