diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index 72cec09b92..be7eef544f 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -101,12 +101,8 @@ static rct_widget window_editor_objective_options_main_widgets[] = { MAIN_OBJECTIVE_OPTIONS_WIDGETS, { WWT_DROPDOWN, 1, 98, 441, 48, 59, STR_NONE, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP }, { WWT_BUTTON, 1, 430, 440, 49, 58, STR_DROPDOWN_GLYPH, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP }, - { WWT_SPINNER, 1, 158, 237, 65, 76, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 226, 236, 66, 70, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 226, 236, 71, 75, STR_NUMERIC_DOWN, STR_NONE }, - { WWT_SPINNER, 1, 158, 277, 82, 93, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 266, 276, 83, 87, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 266, 276, 88, 92, STR_NUMERIC_DOWN, STR_NONE }, + SPINNER_WIDGETS (1, 158, 277, 65, 76, STR_NONE, STR_NONE), // NB: 3 widgets + SPINNER_WIDGETS (1, 158, 277, 82, 93, STR_NONE, STR_NONE), // NB: 3 widgets { WWT_DROPDOWN, 1, 98, 277, 99, 110, STR_NONE, STR_SELECT_CLIMATE_TIP }, { WWT_BUTTON, 1, 266, 276, 100, 109, STR_DROPDOWN_GLYPH, STR_SELECT_CLIMATE_TIP }, { WWT_BUTTON, 1, 370, 444, 116, 127, STR_CHANGE, STR_CHANGE_NAME_OF_PARK_TIP }, diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 76ac549652..8341499cd7 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -107,18 +107,10 @@ static rct_widget window_editor_scenario_options_financial_widgets[] = { { WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SCENARIO_OPTIONS_PARK_TIP }, { WWT_CHECKBOX, 1, 8, 271, 48, 59, STR_MAKE_PARK_NO_MONEY, STR_MAKE_PARK_NO_MONEY_TIP }, - { WWT_SPINNER, 1, 168, 267, 65, 76, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 256, 266, 66, 70, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 256, 266, 71, 75, STR_NUMERIC_DOWN, STR_NONE }, - { WWT_SPINNER, 1, 168, 267, 82, 93, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 256, 266, 83, 87, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 256, 266, 88, 92, STR_NUMERIC_DOWN, STR_NONE }, - { WWT_SPINNER, 1, 168, 267, 99, 110, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 256, 266, 100, 104, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 256, 266, 105, 109, STR_NUMERIC_DOWN, STR_NONE }, - { WWT_SPINNER, 1, 168, 237, 116, 127, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 226, 236, 117, 121, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 226, 236, 122, 126, STR_NUMERIC_DOWN, STR_NONE }, + SPINNER_WIDGETS (1, 168, 267, 65, 76, STR_NONE, STR_NONE ), // NB: 3 widgets + SPINNER_WIDGETS (1, 168, 267, 82, 93, STR_NONE, STR_NONE ), // NB: 3 widgets + SPINNER_WIDGETS (1, 168, 267, 99, 110, STR_NONE, STR_NONE ), // NB: 3 widgets + SPINNER_WIDGETS (1, 168, 237, 116, 127, STR_NONE, STR_NONE ), // NB: 3 widgets { WWT_CHECKBOX, 1, 8, 271, 133, 144, STR_FORBID_MARKETING, STR_FORBID_MARKETING_TIP }, { WIDGETS_END } }; @@ -132,18 +124,10 @@ static rct_widget window_editor_scenario_options_guests_widgets[] = { { WWT_TAB, 1, 34, 64, 17, 46, IMAGE_TYPE_REMAP | SPR_TAB, STR_SCENARIO_OPTIONS_GUESTS_TIP }, { WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SCENARIO_OPTIONS_PARK_TIP }, - { WWT_SPINNER, 1, 268, 337, 48, 59, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 326, 336, 49, 53, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 326, 336, 54, 58, STR_NUMERIC_DOWN, STR_NONE }, - { WWT_SPINNER, 1, 268, 337, 65, 76, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 326, 336, 66, 70, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 326, 336, 71, 75, STR_NUMERIC_DOWN, STR_NONE }, - { WWT_SPINNER, 1, 268, 337, 82, 93, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 326, 336, 83, 87, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 326, 336, 88, 92, STR_NUMERIC_DOWN, STR_NONE }, - { WWT_SPINNER, 1, 268, 337, 99, 110, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 326, 336, 100, 104, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 326, 336, 105, 109, STR_NUMERIC_DOWN, STR_NONE }, + SPINNER_WIDGETS (1, 268, 337, 48, 59, STR_NONE, STR_NONE ), // NB: 3 widgets + SPINNER_WIDGETS (1, 268, 337, 65, 76, STR_NONE, STR_NONE ), // NB: 3 widgets + SPINNER_WIDGETS (1, 268, 337, 82, 93, STR_NONE, STR_NONE ), // NB: 3 widgets + SPINNER_WIDGETS (1, 268, 337, 99, 110, STR_NONE, STR_NONE ), // NB: 3 widgets { WWT_CHECKBOX, 1, 8, 371, 116, 127, STR_GUESTS_PREFER_LESS_INTENSE_RIDES, STR_GUESTS_PREFER_LESS_INTENSE_RIDES_TIP }, { WWT_CHECKBOX, 1, 8, 371, 133, 144, STR_GUESTS_PREFER_MORE_INTENSE_RIDES, STR_GUESTS_PREFER_MORE_INTENSE_RIDES_TIP }, { WIDGETS_END } @@ -158,17 +142,11 @@ static rct_widget window_editor_scenario_options_park_widgets[] = { { WWT_TAB, 1, 34, 64, 17, 46, IMAGE_TYPE_REMAP | SPR_TAB, STR_SCENARIO_OPTIONS_GUESTS_TIP }, { WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SCENARIO_OPTIONS_PARK_TIP }, - { WWT_SPINNER, 1, 188, 257, 48, 59, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 246, 256, 49, 53, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 246, 256, 54, 58, STR_NUMERIC_DOWN, STR_NONE }, - { WWT_SPINNER, 1, 188, 257, 65, 76, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 246, 256, 66, 70, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 246, 256, 71, 75, STR_NUMERIC_DOWN, STR_NONE }, + SPINNER_WIDGETS (1, 188, 257, 48, 59, STR_NONE, STR_NONE ), // NB: 3 widgets + SPINNER_WIDGETS (1, 188, 257, 65, 76, STR_NONE, STR_NONE ), // NB: 3 widgets { WWT_DROPDOWN, 1, 8, 217, 82, 93, STR_NONE, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP }, { WWT_BUTTON, 1, 206, 216, 83, 92, STR_DROPDOWN_GLYPH, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP }, - { WWT_SPINNER, 1, 328, 397, 82, 93, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 386, 396, 83, 87, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 386, 396, 88, 92, STR_NUMERIC_DOWN, STR_NONE }, + SPINNER_WIDGETS (1, 328, 397, 82, 93, STR_NONE, STR_NONE ), // NB: 3 widgets { WWT_CHECKBOX, 1, 8, 391, 99, 110, STR_FORBID_TREE_REMOVAL, STR_FORBID_TREE_REMOVAL_TIP }, { WWT_CHECKBOX, 1, 8, 391, 116, 127, STR_FORBID_LANDSCAPE_CHANGES, STR_FORBID_LANDSCAPE_CHANGES_TIP }, { WWT_CHECKBOX, 1, 8, 391, 133, 144, STR_FORBID_HIGH_CONSTRUCTION, STR_FORBID_HIGH_CONSTRUCTION_TIP }, diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index f0f4611cb8..34008ffb63 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -128,18 +128,10 @@ enum { static rct_widget MapWidgets[] = { SHARED_WIDGETS, - { WWT_BUTTON, 1, WW - 95, WW - 6, WH - 17, WH - 6, STR_MAPGEN_ACTION_GENERATE, STR_NONE }, - - { WWT_SPINNER, 1, 104, 198, 52, 63, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 187, 197, 53, 57, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 187, 197, 58, 62, STR_NUMERIC_DOWN, STR_NONE }, - { WWT_SPINNER, 1, 104, 198, 70, 81, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 187, 197, 71, 75, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 187, 197, 76, 80, STR_NUMERIC_DOWN, STR_NONE }, - { WWT_SPINNER, 1, 104, 198, 88, 99, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 187, 197, 89, 93, STR_NUMERIC_UP, STR_NONE }, - { WWT_BUTTON, 1, 187, 197, 94, 98, STR_NUMERIC_DOWN, STR_NONE }, + SPINNER_WIDGETS (1, 104, 198, 52, 63, STR_NONE, STR_NONE), // NB: 3 widgets + SPINNER_WIDGETS (1, 104, 198, 70, 81, STR_NONE, STR_NONE), // NB: 3 widgets + SPINNER_WIDGETS (1, 104, 198, 88, 99, STR_NONE, STR_NONE), // NB: 3 widgets { WWT_FLATBTN, 1, 104, 150, 106, 141, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP }, { WWT_FLATBTN, 1, 151, 197, 106, 141, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP }, { WIDGETS_END }, @@ -147,9 +139,7 @@ static rct_widget MapWidgets[] = { static rct_widget RandomWidgets[] = { SHARED_WIDGETS, - { WWT_BUTTON, 1, WW - 95, WW - 6, WH - 17, WH - 6, STR_MAPGEN_ACTION_GENERATE, STR_NONE }, - { WWT_CHECKBOX, 1, 4, 198, 52, 63, STR_MAPGEN_OPTION_RANDOM_TERRAIN, STR_NONE }, { WWT_CHECKBOX, 1, 4, 198, 70, 81, STR_MAPGEN_OPTION_PLACE_TREES, STR_NONE }, { WIDGETS_END }, @@ -157,70 +147,31 @@ static rct_widget RandomWidgets[] = { static rct_widget SimplexWidgets[] = { SHARED_WIDGETS, - { WWT_BUTTON, 1, WW - 95, WW - 6, WH - 17, WH - 6, STR_MAPGEN_ACTION_GENERATE, STR_NONE }, // WIDX_SIMPLEX_GENERATE - { WWT_LABEL_CENTRED, 1, 4, 198, 52, 63, STR_MAPGEN_SIMPLEX_NOISE, STR_NONE }, // WIDX_SIMPLEX_LABEL - - { WWT_SPINNER, 1, 104, 198, 70, 81, STR_NONE, STR_NONE }, // WIDX_SIMPLEX_LOW - { WWT_BUTTON, 1, 187, 197, 71, 75, STR_NUMERIC_UP, STR_NONE }, // WIDX_SIMPLEX_LOW_UP - { WWT_BUTTON, 1, 187, 197, 76, 80, STR_NUMERIC_DOWN, STR_NONE }, // WIDX_SIMPLEX_LOW_DOWN - - { WWT_SPINNER, 1, 104, 198, 88, 99, STR_NONE, STR_NONE }, // WIDX_SIMPLEX_HIGH - { WWT_BUTTON, 1, 187, 197, 89, 93, STR_NUMERIC_UP, STR_NONE }, // WIDX_SIMPLEX_HIGH_UP - { WWT_BUTTON, 1, 187, 197, 94, 98, STR_NUMERIC_DOWN, STR_NONE }, // WIDX_SIMPLEX_HIGH_DOWN - - { WWT_SPINNER, 1, 104, 198, 106, 117, STR_NONE, STR_NONE }, // WIDX_SIMPLEX_BASE_FREQ - { WWT_BUTTON, 1, 187, 197, 107, 111, STR_NUMERIC_UP, STR_NONE }, // WIDX_SIMPLEX_BASE_FREQ_UP - { WWT_BUTTON, 1, 187, 197, 112, 116, STR_NUMERIC_DOWN, STR_NONE }, // WIDX_SIMPLEX_BASE_FREQ_DOWN - - { WWT_SPINNER, 1, 104, 198, 124, 135, STR_NONE, STR_NONE }, // WIDX_SIMPLEX_OCTAVES - { WWT_BUTTON, 1, 187, 197, 125, 129, STR_NUMERIC_UP, STR_NONE }, // WIDX_SIMPLEX_OCTAVES_UP - { WWT_BUTTON, 1, 187, 197, 130, 134, STR_NUMERIC_DOWN, STR_NONE }, // WIDX_SIMPLEX_OCTAVES_DOWN - - { WWT_SPINNER, 1, 104, 198, 148, 159, STR_NONE, STR_NONE }, // WIDX_SIMPLEX_MAP_SIZE - { WWT_BUTTON, 1, 187, 197, 149, 153, STR_NUMERIC_UP, STR_NONE }, // WIDX_SIMPLEX_MAP_SIZE_UP - { WWT_BUTTON, 1, 187, 197, 154, 158, STR_NUMERIC_DOWN, STR_NONE }, // WIDX_SIMPLEX_MAP_SIZE_DOWN - - { WWT_SPINNER, 1, 104, 198, 166, 177, STR_NONE, STR_NONE }, // WIDX_SIMPLEX_WATER_LEVEL - { WWT_BUTTON, 1, 187, 197, 167, 171, STR_NUMERIC_UP, STR_NONE }, // WIDX_SIMPLEX_WATER_LEVEL_UP - { WWT_BUTTON, 1, 187, 197, 172, 176, STR_NUMERIC_DOWN, STR_NONE }, // WIDX_SIMPLEX_WATER_LEVEL_DOWN - + SPINNER_WIDGETS (1, 104, 198, 70, 81, STR_NONE, STR_NONE), // WIDX_SIMPLEX_LOW{,_UP,_DOWN} + SPINNER_WIDGETS (1, 104, 198, 88, 99, STR_NONE, STR_NONE), // WIDX_SIMPLEX_HIGH{,_UP,_DOWN} + SPINNER_WIDGETS (1, 104, 198, 106, 117, STR_NONE, STR_NONE), // WIDX_SIMPLEX_BASE_FREQ{,_UP,_DOWN} + SPINNER_WIDGETS (1, 104, 198, 124, 135, STR_NONE, STR_NONE), // WIDX_SIMPLEX_OCTAVES{,_UP,_DOWN} + SPINNER_WIDGETS (1, 104, 198, 148, 159, STR_NONE, STR_NONE), // WIDX_SIMPLEX_MAP_SIZE{,_UP,_DOWN} + SPINNER_WIDGETS (1, 104, 198, 166, 177, STR_NONE, STR_NONE), // WIDX_SIMPLEX_WATER_LEVEL{,_UP,_DOWN} { WWT_CHECKBOX, 1, 104, 198, 190, 201, STR_MAPGEN_OPTION_RANDOM_TERRAIN, STR_NONE }, // WIDX_SIMPLEX_RANDOM_TERRAIN_CHECKBOX { WWT_FLATBTN, 1, 102, 148, 202, 237, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP }, // WIDX_SIMPLEX_FLOOR_TEXTURE { WWT_FLATBTN, 1, 150, 196, 202, 237, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP }, // WIDX_SIMPLEX_WALL_TEXTURE - { WWT_CHECKBOX, 1, 104, 198, 239, 250, STR_NONE, STR_NONE }, // WIDX_SIMPLEX_PLACE_TREES_CHECKBOX - { WIDGETS_END }, }; static rct_widget HeightmapWidgets[] = { SHARED_WIDGETS, - { WWT_BUTTON, 1, WW - 155, WW - 6, WH - 17, WH - 6, STR_MAPGEN_SELECT_HEIGHTMAP, STR_NONE }, // WIDX_HEIGHTMAP_SELECT - { WWT_CHECKBOX, 1, 4, 103, 52, 63, STR_MAPGEN_SMOOTH_HEIGHTMAP,STR_NONE }, // WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP - { WWT_SPINNER, 1, 104, 198, 70, 81, STR_NONE, STR_NONE }, // WIDX_HEIGHTMAP_STRENGTH - { WWT_BUTTON, 1, 187, 197, 71, 75, STR_NUMERIC_UP, STR_NONE }, // WIDX_HEIGHTMAP_STRENGTH_UP - { WWT_BUTTON, 1, 187, 197, 76, 80, STR_NUMERIC_DOWN, STR_NONE }, // WIDX_HEIGHTMAP_STRENGTH_DOWN - + SPINNER_WIDGETS (1, 104, 198, 70, 81, STR_NONE, STR_NONE), // WIDX_HEIGHTMAP_STRENGTH{,_UP,_DOWN} { WWT_CHECKBOX, 1, 4, 103, 88, 99, STR_MAPGEN_NORMALIZE, STR_NONE }, // WIDX_HEIGHTMAP_NORMALIZE - { WWT_CHECKBOX, 1, 4, 103, 106, 117, STR_MAPGEN_SMOOTH_TILE, STR_NONE }, // WIDX_HEIGHTMAP_SMOOTH_TILES - - { WWT_SPINNER, 1, 104, 198, 124, 135, STR_NONE, STR_NONE }, // WIDX_HEIGHTMAP_LOW - { WWT_BUTTON, 1, 187, 197, 125, 129, STR_NUMERIC_UP, STR_NONE }, // WIDX_HEIGHTMAP_LOW_UP - { WWT_BUTTON, 1, 187, 197, 130, 134, STR_NUMERIC_DOWN, STR_NONE }, // WIDX_HEIGHTMAP_LOW_DOWN - - { WWT_SPINNER, 1, 104, 198, 142, 153, STR_NONE, STR_NONE }, // WIDX_HEIGHTMAP_HIGH - { WWT_BUTTON, 1, 187, 197, 143, 147, STR_NUMERIC_UP, STR_NONE }, // WIDX_HEIGHTMAP_HIGH_UP - { WWT_BUTTON, 1, 187, 197, 148, 152, STR_NUMERIC_DOWN, STR_NONE }, // WIDX_HEIGHTMAP_HIGH_DOWN - - { WWT_SPINNER, 1, 104, 198, 160, 171, STR_NONE, STR_NONE }, // WIDX_HEIGHTMAP_WATER_LEVEL - { WWT_BUTTON, 1, 187, 197, 161, 165, STR_NUMERIC_UP, STR_NONE }, // WIDX_HEIGHTMAP_WATER_LEVEL_UP - { WWT_BUTTON, 1, 187, 197, 166, 170, STR_NUMERIC_DOWN, STR_NONE }, // WIDX_HEIGHTMAP_WATER_LEVEL_DOWN - + SPINNER_WIDGETS (1, 104, 198, 124, 135, STR_NONE, STR_NONE), // WIDX_HEIGHTMAP_LOW{,_UP,_DOWN} + SPINNER_WIDGETS (1, 104, 198, 142, 153, STR_NONE, STR_NONE), // WIDX_HEIGHTMAP_HIGH{,_UP,_DOWN} + SPINNER_WIDGETS (1, 104, 198, 160, 171, STR_NONE, STR_NONE), // WIDX_HEIGHTMAP_WATER_LEVEL{,_UP,_DOWN} { WIDGETS_END }, };