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

Add custom window captions for each page

Browse Source
This commit is contained in:
Aaron van Geffen
2024-09-10 20:10:58 +02:00
parent a2b572b6f3
commit 6f83e44a82
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/language/en-GB.txt
View File

@@ -3754,6 +3754,10 @@ STR_6679 :Flatland
STR_6680 :Simplex noise (random)
STR_6681 :Simplex noise (custom)
STR_6682 :Heightmap file
STR_6683 :Map Generator - Generator
STR_6684 :Map Generator - Terrain
STR_6685 :Map Generator - Water
STR_6686 :Map Generator - Forests
#############
# Scenarios #

6
src/openrct2-ui/UiStringIds.h
View File

@@ -907,6 +907,10 @@ namespace OpenRCT2
STR_HEIGHTMAP_SIMPLEX_NOISE = 6680,
STR_HEIGHTMAP_SOURCE = 6678,
STR_MAPGEN_ACTION_GENERATE = 2694,
STR_MAPGEN_CAPTION_FORESTS = 6686,
STR_MAPGEN_CAPTION_GENERATOR = 6683,
STR_MAPGEN_CAPTION_TERRAIN = 6684,
STR_MAPGEN_CAPTION_WATER = 6685,
STR_MAPGEN_NORMALIZE = 6046,
STR_MAPGEN_OPTION_PLACE_TREES = 2696,
STR_MAPGEN_OPTION_RANDOM_TERRAIN = 2695,
@@ -919,7 +923,6 @@ namespace OpenRCT2
STR_MAPGEN_SMOOTH_HEIGHTMAP = 6044,
STR_MAPGEN_SMOOTH_STRENGTH = 6045,
STR_MAPGEN_SMOOTH_TILE = 6047,
STR_MAPGEN_WINDOW_TITLE = 2690,
STR_TERRAIN_LABEL = 2693,
STR_WATER_LEVEL = 5185,
STR_WATER_LEVEL_LABEL = 2692,
@@ -2138,6 +2141,7 @@ namespace OpenRCT2
STR_HEIGHT_MARKS_ON_RIDE_TRACKS = 1153,
STR_HIGHLIGHT_PATH_ISSUES_MENU = 6219,
STR_LOAD_LANDSCAPE = 884,
STR_MAPGEN_MENU_ITEM = 2690,
STR_MULTIPLAYER_RECONNECT = 6309,
STR_NEW_GAME = 5715,
STR_OVERLAY_CLEARANCE_CHECKS_DISABLED = 6374,

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

@@ -101,12 +101,11 @@ namespace OpenRCT2::Ui::Windows
#pragma region Widgets
static constexpr StringId WINDOW_TITLE = STR_MAPGEN_WINDOW_TITLE;
static constexpr int32_t WW = 300;
static constexpr int32_t WH = 220;
#define SHARED_WIDGETS \
WINDOW_SHIM(WINDOW_TITLE, WW, WH), /* WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE */ \
#define SHARED_WIDGETS(PAGE_TITLE) \
WINDOW_SHIM(PAGE_TITLE, WW, WH), /* WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE */ \
MakeWidget({ 0, 43 }, { WW, 177 }, WindowWidgetType::Resize, WindowColour::Secondary), /* WIDX_PAGE_BACKGROUND */ \
MakeTab({ 3, 17 }), /* WIDX_TAB_1 */ \
MakeTab({ 34, 17 }), /* WIDX_TAB_2 */ \
@@ -116,7 +115,7 @@ namespace OpenRCT2::Ui::Windows
// clang-format off
static Widget BaseWidgets[] = {
SHARED_WIDGETS,
SHARED_WIDGETS(STR_MAPGEN_CAPTION_GENERATOR),
MakeSpinnerWidgets ({165, 52}, { 50, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_COMMA16 ), // NB: 3 widgets
MakeWidget ({216, 52}, { 21, 12}, WindowWidgetType::FlatBtn, WindowColour::Secondary, ImageId(SPR_G2_LINK_CHAIN), STR_MAINTAIN_SQUARE_MAP_TOOLTIP),
MakeSpinnerWidgets ({238, 52}, { 50, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_POP16_COMMA16 ), // NB: 3 widgets
@@ -135,7 +134,7 @@ namespace OpenRCT2::Ui::Windows
};
static Widget TerrainWidgets[] = {
SHARED_WIDGETS,
SHARED_WIDGETS(STR_MAPGEN_CAPTION_TERRAIN),
MakeSpinnerWidgets({179, 52}, {95, 12}, WindowWidgetType::Spinner, WindowColour::Secondary ), // NB: 3 widgets
MakeWidget ({179, 70}, {95, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_MAPGEN_OPTION_RANDOM_TERRAIN ),
MakeWidget ({179, 82}, {47, 36}, WindowWidgetType::FlatBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP ),
@@ -147,15 +146,15 @@ namespace OpenRCT2::Ui::Windows
};
static Widget WaterWidgets[] = {
SHARED_WIDGETS,
SHARED_WIDGETS(STR_MAPGEN_CAPTION_WATER),
MakeSpinnerWidgets({179, 52}, { 95, 12}, WindowWidgetType::Spinner, WindowColour::Secondary ), // NB: 3 widgets
MakeWidget ({ 10, 70}, {195, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_BEACHES_WATER_BODIES),
kWidgetsEnd,
};
static Widget ForestsWidgets[] = {
SHARED_WIDGETS,
MakeWidget({ 4, 52}, {255, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_MAPGEN_OPTION_PLACE_TREES ),
SHARED_WIDGETS(STR_MAPGEN_CAPTION_FORESTS),
MakeWidget({ 10, 52}, {255, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_MAPGEN_OPTION_PLACE_TREES ),
kWidgetsEnd,
};

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

@@ -1173,7 +1173,7 @@ namespace OpenRCT2::Ui::Windows
gDropdownItems[i++].Format = STR_EXTRA_VIEWPORT;
if ((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && GetGameState().EditorStep == EditorStep::LandscapeEditor)
{
gDropdownItems[i++].Format = STR_MAPGEN_WINDOW_TITLE;
gDropdownItems[i++].Format = STR_MAPGEN_MENU_ITEM;
}
#ifdef ENABLE_SCRIPTING