mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Use std::size instead of Util::CountOf

Browse Source
This commit is contained in:
Hielke Morsink
2018-11-21 23:16:04 +01:00
parent 88b2f5fa53
commit 354d973a48
82 changed files with 2216 additions and 2180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/interface/Window.cpp
View File

@@ -17,7 +17,6 @@
#include "../audio/audio.h"
#include "../config/Config.h"
#include "../core/Guard.hpp"
#include "../core/Util.hpp"
#include "../drawing/Drawing.h"
#include "../interface/Cursors.h"
#include "../localisation/Localisation.h"
@@ -35,6 +34,7 @@
#include <algorithm>
#include <cmath>
#include <iterator>
std::vector<std::unique_ptr<rct_window>> g_window_list;
rct_window* gWindowAudioExclusive;
@@ -912,7 +912,7 @@ void window_scroll_to_location(rct_window* w, int32_t x, int32_t y, int32_t z)
}
}
}
if (i >= (int32_t)Util::CountOf(window_scroll_locations))
if (i >= (int32_t)std::size(window_scroll_locations))
{
i = 0;
found = true;