mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Move kRideInspectionIntervalNames into Ride unit

Browse Source
This commit is contained in:
Aaron van Geffen
2024-07-13 12:30:40 +02:00
parent c21a7b1178
commit a97820f297
6 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/windows/Options.cpp
View File

@@ -1783,7 +1783,7 @@ static Widget *window_options_page_widgets[] = {
for (size_t i = 0; i < 7; i++)
{
gDropdownItems[i].Format = STR_DROPDOWN_MENU_LABEL;
gDropdownItems[i].Args = RideInspectionIntervalNames[i];
gDropdownItems[i].Args = kRideInspectionIntervalNames[i];
}
ShowDropdown(widget, 7);
@@ -1886,7 +1886,7 @@ static Widget *window_options_page_widgets[] = {
disabled_widgets |= (1uLL << WIDX_SCENARIO_UNLOCKING);
}
widgets[WIDX_DEFAULT_INSPECTION_INTERVAL].text = RideInspectionIntervalNames
widgets[WIDX_DEFAULT_INSPECTION_INTERVAL].text = kRideInspectionIntervalNames
[Config::Get().general.DefaultInspectionInterval];
}

4
src/openrct2-ui/windows/Ride.cpp
View File

@@ -3724,7 +3724,7 @@ static_assert(std::size(RatingNames) == 6);
for (int32_t i = 0; i < 7; i++)
{
gDropdownItems[i].Format = STR_DROPDOWN_MENU_LABEL;
gDropdownItems[i].Args = RideInspectionIntervalNames[i];
gDropdownItems[i].Args = kRideInspectionIntervalNames[i];
}
WindowDropdownShowTextCustomWidth(
{ windowPos.x + dropdownWidget->left, windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
@@ -3936,7 +3936,7 @@ static_assert(std::size(RatingNames) == 6);
auto ft = Formatter::Common();
ride->FormatNameTo(ft);
widgets[WIDX_INSPECTION_INTERVAL].text = RideInspectionIntervalNames[ride->inspection_interval];
widgets[WIDX_INSPECTION_INTERVAL].text = kRideInspectionIntervalNames[ride->inspection_interval];
AnchorBorderWidgets();
WindowAlignTabs(this, WIDX_TAB_1, WIDX_TAB_10);

13
src/openrct2/localisation/Localisation.cpp
View File

@@ -20,7 +20,6 @@
#include "FormatCodes.h"
#include "Formatting.h"
#include "Localisation.Date.h"
#include "StringIds.h"
#include <cstring>
@@ -28,18 +27,6 @@ using namespace OpenRCT2;
thread_local char gCommonStringFormatBuffer[CommonTextBufferSize];
// clang-format off
const StringId RideInspectionIntervalNames[] = {
STR_EVERY_10_MINUTES,
STR_EVERY_20_MINUTES,
STR_EVERY_30_MINUTES,
STR_EVERY_45_MINUTES,
STR_EVERY_HOUR,
STR_EVERY_2_HOURS,
STR_NEVER,
};
// clang-format on
std::string FormatStringIDLegacy(StringId format, const void* args)
{
std::string buffer(256, 0);

2
src/openrct2/localisation/Localisation.h
View File

@@ -21,5 +21,3 @@ constexpr size_t kUserStringMaxLength = 32;
constexpr size_t CommonTextBufferSize = 512;
extern thread_local char gCommonStringFormatBuffer[CommonTextBufferSize];
extern const StringId RideInspectionIntervalNames[];

13
src/openrct2/ride/Ride.cpp
View File

@@ -35,7 +35,6 @@
#include "../localisation/Formatter.h"
#include "../localisation/Formatting.h"
#include "../localisation/Localisation.Date.h"
#include "../localisation/Localisation.h"
#include "../management/Finance.h"
#include "../management/Marketing.h"
#include "../management/NewsItem.h"
@@ -95,6 +94,18 @@ static constexpr int32_t RideInspectionInterval[] = {
10, 20, 30, 45, 60, 120, 0, 0,
};
// clang-format off
const StringId kRideInspectionIntervalNames[] = {
STR_EVERY_10_MINUTES,
STR_EVERY_20_MINUTES,
STR_EVERY_30_MINUTES,
STR_EVERY_45_MINUTES,
STR_EVERY_HOUR,
STR_EVERY_2_HOURS,
STR_NEVER,
};
// clang-format on
// This is the highest used index + 1 of the GameState_t::Rides array.
static size_t _endOfUsedRange = 0;

2
src/openrct2/ride/Ride.h
View File

@@ -56,6 +56,8 @@ constexpr uint8_t kRideNumPoweredLiftsMask = 0b11000000;
constexpr money64 kRideMinPrice = 0.00_GBP;
constexpr money64 kRideMaxPrice = 20.00_GBP;
extern const StringId kRideInspectionIntervalNames[];
struct RideStation
{
static constexpr uint8_t kNoTrain = std::numeric_limits<uint8_t>::max();