mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Fixup: workaround for std::ranges::reverse_view being too new

Browse Source
This commit is contained in:
Aaron van Geffen
2024-05-08 21:52:49 +02:00
parent 05448222e2
commit 1e9bee0c00
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/openrct2-ui/windows/TopToolbar.cpp
View File

@@ -70,7 +70,6 @@
#include <openrct2/world/Scenery.h>
#include <openrct2/world/Surface.h>
#include <openrct2/world/Wall.h>
#include <ranges>
#include <string>
namespace OpenRCT2::Ui::Windows
@@ -229,23 +228,24 @@ namespace OpenRCT2::Ui::Windows
WIDX_MAP,
};
// NB: this array in reverse order!
static constexpr std::array kWidgetOrderRightGroup = {
WIDX_CLEAR_SCENERY,
WIDX_LAND,
WIDX_WATER,
WIDX_SCENERY,
WIDX_PATH,
WIDX_CONSTRUCT_RIDE,
WIDX_NEWS,
WIDX_GUESTS,
WIDX_STAFF,
WIDX_PARK,
WIDX_RIDES,
WIDX_RESEARCH,
WIDX_FINANCES,
WIDX_SEPARATOR,
WIDX_FINANCES,
WIDX_RESEARCH,
WIDX_RIDES,
WIDX_PARK,
WIDX_STAFF,
WIDX_GUESTS,
WIDX_NEWS,
WIDX_CONSTRUCT_RIDE,
WIDX_PATH,
WIDX_SCENERY,
WIDX_WATER,
WIDX_LAND,
WIDX_CLEAR_SCENERY,
};
static constexpr size_t _totalToolbarElements = kWidgetOrderLeftGroup.size() + kWidgetOrderRightGroup.size();
@@ -256,7 +256,7 @@ namespace OpenRCT2::Ui::Windows
auto halfWayPoint = std::copy(kWidgetOrderLeftGroup.begin(), kWidgetOrderLeftGroup.end(), combined.begin());
*halfWayPoint = WIDX_SEPARATOR;
std::copy(kWidgetOrderRightGroup.begin(), kWidgetOrderRightGroup.end(), halfWayPoint + 1);
std::reverse_copy(kWidgetOrderRightGroup.begin(), kWidgetOrderRightGroup.end(), halfWayPoint + 1);
return combined;
}();
@@ -3153,7 +3153,7 @@ namespace OpenRCT2::Ui::Windows
int32_t screenWidth = ContextGetWidth();
firstAlignment = true;
x = std::max(640, screenWidth);
for (auto widgetIndex : std::ranges::reverse_view(kWidgetOrderRightGroup))
for (auto widgetIndex : kWidgetOrderRightGroup)
{
auto* widget = &widgets[widgetIndex];
if (widget->type == WindowWidgetType::Empty && widgetIndex != WIDX_SEPARATOR)