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

Rename value strings for spinners (#16637)

Browse Source
This commit is contained in:
Michael Steenbeek
2022-02-12 20:17:37 +01:00
committed by GitHub
parent 44a607800e
commit ee54603695
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@@ -843,7 +843,7 @@ static void WindowEditorObjectiveOptionsMainPaint(rct_window* w, rct_drawpixelin
{
case OBJECTIVE_GUESTS_BY:
case OBJECTIVE_GUESTS_AND_RATING:
stringId = STR_WINDOW_OBJECTIVE_VALUE_GUEST_COUNT;
stringId = STR_WINDOW_COLOUR_2_COMMA16;
ft.Add<uint16_t>(gScenarioObjective.NumGuests);
break;
case OBJECTIVE_PARK_VALUE_BY:
@@ -854,15 +854,15 @@ static void WindowEditorObjectiveOptionsMainPaint(rct_window* w, rct_drawpixelin
ft.Add<money64>(gScenarioObjective.Currency);
break;
case OBJECTIVE_10_ROLLERCOASTERS_LENGTH:
stringId = STR_WINDOW_OBJECTIVE_VALUE_LENGTH;
stringId = STR_WINDOW_COLOUR_2_LENGTH;
ft.Add<uint16_t>(gScenarioObjective.MinimumLength);
break;
case OBJECTIVE_FINISH_5_ROLLERCOASTERS:
stringId = STR_WINDOW_OBJECTIVE_VALUE_RATING;
stringId = STR_WINDOW_COLOUR_2_COMMA2DP32;
ft.Add<uint16_t>(gScenarioObjective.MinimumExcitement);
break;
default:
stringId = STR_WINDOW_OBJECTIVE_VALUE_RATING;
stringId = STR_WINDOW_COLOUR_2_COMMA2DP32;
ft.Add<money64>(gScenarioObjective.Currency);
break;
}

2
src/openrct2-ui/windows/MapGen.cpp
View File

@@ -1062,7 +1062,7 @@ static void WindowMapgenSimplexPaint(rct_window* w, rct_drawpixelinfo* dpi)
dpi,
w->windowPos
+ ScreenCoordsXY{ w->widgets[WIDX_SIMPLEX_BASE_FREQ].left + 1, w->widgets[WIDX_SIMPLEX_BASE_FREQ].top + 1 },
STR_WINDOW_OBJECTIVE_VALUE_RATING, ft, { textColour });
STR_WINDOW_COLOUR_2_COMMA2DP32, ft, { textColour });
ft = Formatter();
ft.Add<uint16_t>(_simplex_octaves);
DrawTextBasic(

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

@@ -1029,7 +1029,7 @@ private:
ft.Add<int32_t>(static_cast<int32_t>(gConfigGeneral.window_scale * 100));
DrawTextBasic(
dpi, windowPos + ScreenCoordsXY{ widgets[WIDX_SCALE].left + 1, widgets[WIDX_SCALE].top + 1 },
STR_WINDOW_OBJECTIVE_VALUE_RATING, ft, { colours[1] });
STR_WINDOW_COLOUR_2_COMMA2DP32, ft, { colours[1] });
}
#pragma endregion
@@ -2142,7 +2142,7 @@ private:
ft.Add<int32_t>(static_cast<int32_t>(gConfigGeneral.autosave_amount));
DrawTextBasic(
dpi, windowPos + ScreenCoordsXY{ widgets[WIDX_AUTOSAVE_AMOUNT].left + 1, widgets[WIDX_AUTOSAVE_AMOUNT].top + 1 },
STR_WINDOW_OBJECTIVE_VALUE_GUEST_COUNT, ft, { colours[1] });
STR_WINDOW_COLOUR_2_COMMA16, ft, { colours[1] });
const auto normalisedPath = Platform::StrDecompToPrecomp(gConfigGeneral.rct1_path);
ft = Formatter();

6
src/openrct2/localisation/StringIds.h
View File

@@ -2477,9 +2477,9 @@ enum : uint16_t
STR_WINDOW_OBJECTIVE_MONTHLY_PROFIT = 3306,
STR_WINDOW_OBJECTIVE_MINIMUM_LENGTH = 3307,
STR_WINDOW_OBJECTIVE_EXCITEMENT_RATING = 3308,
STR_WINDOW_OBJECTIVE_VALUE_GUEST_COUNT = 3309,
STR_WINDOW_OBJECTIVE_VALUE_LENGTH = 3310,
STR_WINDOW_OBJECTIVE_VALUE_RATING = 3311,
STR_WINDOW_COLOUR_2_COMMA16 = 3309,
STR_WINDOW_COLOUR_2_LENGTH = 3310,
STR_WINDOW_COLOUR_2_COMMA2DP32 = 3311,
STR_WINDOW_PRESERVATION_ORDER = 3312,
STR_SCENARIO_NAME = 3313,
STR_ENTER_SCENARIO_NAME = 3314,