mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2026-01-20 13:33:02 +01:00
Refactor more windows into new-style widget format
* Ride Construction * Ride List * Save Prompt * Scenery * Scenery Scatter * Server List * Server Start * Shortcut Keys
This commit is contained in:
Aaron van Geffen
@@ -92,41 +92,41 @@ validate_global_widx(WC_RIDE_CONSTRUCTION, WIDX_ROTATE);
|
||||
|
||||
static rct_widget window_ride_construction_widgets[] = {
|
||||
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
|
||||
{ WWT_GROUPBOX, 0, 3, 162, 17, 73, STR_RIDE_CONSTRUCTION_DIRECTION, STR_NONE },
|
||||
{ WWT_GROUPBOX, 0, 3, 162, 76, 116, STR_RIDE_CONSTRUCTION_SLOPE, STR_NONE },
|
||||
{ WWT_GROUPBOX, 0, 3, 162, 120, 160, STR_RIDE_CONSTRUCTION_ROLL_BANKING, STR_NONE },
|
||||
{ WWT_FLATBTN, 1, 6, 27, 29, 52, SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_LEFT_CURVE_VERY_SMALL_TIP },
|
||||
{ WWT_FLATBTN, 1, 6, 27, 29, 52, SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL_TIP },
|
||||
{ WWT_FLATBTN, 1, 28, 49, 29, 52, SPR_RIDE_CONSTRUCTION_LEFT_CURVE, STR_RIDE_CONSTRUCTION_LEFT_CURVE_TIP },
|
||||
{ WWT_FLATBTN, 1, 72, 93, 29, 52, SPR_RIDE_CONSTRUCTION_STRAIGHT, STR_RIDE_CONSTRUCTION_STRAIGHT_TIP },
|
||||
{ WWT_FLATBTN, 1, 116, 137, 29, 52, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_TIP },
|
||||
{ WWT_FLATBTN, 1, 138, 159, 29, 52, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL_TIP },
|
||||
{ WWT_FLATBTN, 1, 138, 159, 29, 52, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_VERY_SMALL_TIP },
|
||||
{ WWT_BUTTON, 1, 17, 148, 55, 68, STR_YELLOW_STRING, STR_RIDE_CONSTRUCTION_OTHER_TRACK_CONFIGURATIONS_TIP },
|
||||
{ WWT_FLATBTN, 1, 23, 46, 88, 111, SPR_RIDE_CONSTRUCTION_SLOPE_DOWN_STEEP, STR_RIDE_CONSTRUCTION_STEEP_SLOPE_DOWN_TIP },
|
||||
{ WWT_FLATBTN, 1, 47, 70, 88, 111, SPR_RIDE_CONSTRUCTION_SLOPE_DOWN, STR_RIDE_CONSTRUCTION_SLOPE_DOWN_TIP },
|
||||
{ WWT_FLATBTN, 1, 71, 94, 88, 111, SPR_RIDE_CONSTRUCTION_SLOPE_LEVEL, STR_RIDE_CONSTRUCTION_LEVEL_TIP },
|
||||
{ WWT_FLATBTN, 1, 95, 118, 88, 111, SPR_RIDE_CONSTRUCTION_SLOPE_UP, STR_RIDE_CONSTRUCTION_SLOPE_UP_TIP },
|
||||
{ WWT_FLATBTN, 1, 119, 142, 88, 111, SPR_RIDE_CONSTRUCTION_SLOPE_UP_STEEP, STR_RIDE_CONSTRUCTION_STEEP_SLOPE_UP_TIP },
|
||||
{ WWT_FLATBTN, 1, 134, 157, 88, 111, SPR_CHAIN_LIFT, STR_RIDE_CONSTRUCTION_CHAIN_LIFT_TIP },
|
||||
{ WWT_FLATBTN, 1, 47, 70, 132, 155, SPR_RIDE_CONSTRUCTION_LEFT_BANK, STR_RIDE_CONSTRUCTION_ROLL_FOR_LEFT_CURVE_TIP },
|
||||
{ WWT_FLATBTN, 1, 71, 94, 132, 155, SPR_RIDE_CONSTRUCTION_NO_BANK, STR_RIDE_CONSTRUCTION_NO_ROLL_TIP },
|
||||
{ WWT_FLATBTN, 1, 95, 118, 132, 155, SPR_RIDE_CONSTRUCTION_RIGHT_BANK, STR_RIDE_CONSTRUCTION_ROLL_FOR_RIGHT_CURVE_TIP },
|
||||
{ WWT_IMGBTN, 1, 3, 162, 164, 333, 0xFFFFFFFF, STR_RIDE_CONSTRUCTION_CONSTRUCT_SELECTED_SECTION_TIP },
|
||||
{ WWT_FLATBTN, 1, 60, 105, 338, 361, SPR_DEMOLISH_CURRENT_SECTION, STR_RIDE_CONSTRUCTION_REMOVE_HIGHLIGHTED_SECTION_TIP },
|
||||
{ WWT_FLATBTN, 1, 50, 71, 29, 52, SPR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE, STR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE_TIP },
|
||||
{ WWT_FLATBTN, 1, 30, 53, 338, 361, SPR_PREVIOUS, STR_RIDE_CONSTRUCTION_MOVE_TO_PREVIOUS_SECTION_TIP },
|
||||
{ WWT_FLATBTN, 1, 112, 135, 338, 361, SPR_NEXT, STR_RIDE_CONSTRUCTION_MOVE_TO_NEXT_SECTION_TIP },
|
||||
{ WWT_GROUPBOX, 0, 3, 162, 362, 389, 0xFFFFFFFF, STR_NONE },
|
||||
{ WWT_BUTTON, 1, 9, 78, 372, 383, STR_RIDE_CONSTRUCTION_ENTRANCE, STR_RIDE_CONSTRUCTION_ENTRANCE_TIP },
|
||||
{ WWT_BUTTON, 1, 87, 156, 372, 383, STR_RIDE_CONSTRUCTION_EXIT, STR_RIDE_CONSTRUCTION_EXIT_TIP },
|
||||
{ WWT_FLATBTN, 1, 94, 115, 29, 52, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE_TIP },
|
||||
{ WWT_FLATBTN, 1, 72, 95, 338, 361, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP },
|
||||
{ WWT_FLATBTN, 1, 19, 42, 132, 155, SPR_RIDE_CONSTRUCTION_U_SHAPED_TRACK, STR_RIDE_CONSTRUCTION_U_SHAPED_OPEN_TRACK_TIP },
|
||||
{ WWT_FLATBTN, 1, 123, 146, 132, 155, SPR_RIDE_CONSTRUCTION_O_SHAPED_TRACK, STR_RIDE_CONSTRUCTION_O_SHAPED_ENCLOSED_TRACK_TIP },
|
||||
{ WWT_GROUPBOX, 0, 96, 162, 120, 160, STR_RIDE_CONSTRUCTION_SEAT_ROT, STR_NONE },
|
||||
SPINNER_WIDGETS (1, 101, 158, 138, 149, 0, STR_RIDE_CONSTRUCTION_SELECT_SEAT_ROTATION_ANGLE_TIP),
|
||||
{ WWT_FLATBTN, 1, 139, 162, 338, 361, SPR_G2_SIMULATE, STR_SIMULATE_RIDE_TIP },
|
||||
MakeWidget ({ 3, 17}, {160, 57}, WWT_GROUPBOX, 0, STR_RIDE_CONSTRUCTION_DIRECTION ),
|
||||
MakeWidget ({ 3, 76}, {160, 41}, WWT_GROUPBOX, 0, STR_RIDE_CONSTRUCTION_SLOPE ),
|
||||
MakeWidget ({ 3, 120}, {160, 41}, WWT_GROUPBOX, 0, STR_RIDE_CONSTRUCTION_ROLL_BANKING ),
|
||||
MakeWidget ({ 6, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_LEFT_CURVE_VERY_SMALL_TIP ),
|
||||
MakeWidget ({ 6, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL_TIP ),
|
||||
MakeWidget ({ 28, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_LEFT_CURVE, STR_RIDE_CONSTRUCTION_LEFT_CURVE_TIP ),
|
||||
MakeWidget ({ 72, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_STRAIGHT, STR_RIDE_CONSTRUCTION_STRAIGHT_TIP ),
|
||||
MakeWidget ({116, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_TIP ),
|
||||
MakeWidget ({138, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL_TIP ),
|
||||
MakeWidget ({138, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_VERY_SMALL_TIP ),
|
||||
MakeWidget ({ 17, 55}, {132, 14}, WWT_BUTTON, 1, STR_YELLOW_STRING, STR_RIDE_CONSTRUCTION_OTHER_TRACK_CONFIGURATIONS_TIP),
|
||||
MakeWidget ({ 23, 88}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_DOWN_STEEP, STR_RIDE_CONSTRUCTION_STEEP_SLOPE_DOWN_TIP ),
|
||||
MakeWidget ({ 47, 88}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_DOWN, STR_RIDE_CONSTRUCTION_SLOPE_DOWN_TIP ),
|
||||
MakeWidget ({ 71, 88}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_LEVEL, STR_RIDE_CONSTRUCTION_LEVEL_TIP ),
|
||||
MakeWidget ({ 95, 88}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_UP, STR_RIDE_CONSTRUCTION_SLOPE_UP_TIP ),
|
||||
MakeWidget ({119, 88}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_UP_STEEP, STR_RIDE_CONSTRUCTION_STEEP_SLOPE_UP_TIP ),
|
||||
MakeWidget ({134, 88}, { 24, 24}, WWT_FLATBTN, 1, SPR_CHAIN_LIFT, STR_RIDE_CONSTRUCTION_CHAIN_LIFT_TIP ),
|
||||
MakeWidget ({ 47, 132}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_LEFT_BANK, STR_RIDE_CONSTRUCTION_ROLL_FOR_LEFT_CURVE_TIP ),
|
||||
MakeWidget ({ 71, 132}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_NO_BANK, STR_RIDE_CONSTRUCTION_NO_ROLL_TIP ),
|
||||
MakeWidget ({ 95, 132}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_RIGHT_BANK, STR_RIDE_CONSTRUCTION_ROLL_FOR_RIGHT_CURVE_TIP ),
|
||||
MakeWidget ({ 3, 164}, {160, 170}, WWT_IMGBTN, 1, 0xFFFFFFFF, STR_RIDE_CONSTRUCTION_CONSTRUCT_SELECTED_SECTION_TIP),
|
||||
MakeWidget ({ 60, 338}, { 46, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH_CURRENT_SECTION, STR_RIDE_CONSTRUCTION_REMOVE_HIGHLIGHTED_SECTION_TIP),
|
||||
MakeWidget ({ 50, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE, STR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE_TIP ),
|
||||
MakeWidget ({ 30, 338}, { 24, 24}, WWT_FLATBTN, 1, SPR_PREVIOUS, STR_RIDE_CONSTRUCTION_MOVE_TO_PREVIOUS_SECTION_TIP ),
|
||||
MakeWidget ({112, 338}, { 24, 24}, WWT_FLATBTN, 1, SPR_NEXT, STR_RIDE_CONSTRUCTION_MOVE_TO_NEXT_SECTION_TIP ),
|
||||
MakeWidget ({ 3, 362}, {160, 28}, WWT_GROUPBOX, 0 ),
|
||||
MakeWidget ({ 9, 372}, { 70, 12}, WWT_BUTTON, 1, STR_RIDE_CONSTRUCTION_ENTRANCE, STR_RIDE_CONSTRUCTION_ENTRANCE_TIP ),
|
||||
MakeWidget ({ 87, 372}, { 70, 12}, WWT_BUTTON, 1, STR_RIDE_CONSTRUCTION_EXIT, STR_RIDE_CONSTRUCTION_EXIT_TIP ),
|
||||
MakeWidget ({ 94, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE_TIP ),
|
||||
MakeWidget ({ 72, 338}, { 24, 24}, WWT_FLATBTN, 1, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP ),
|
||||
MakeWidget ({ 19, 132}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_U_SHAPED_TRACK, STR_RIDE_CONSTRUCTION_U_SHAPED_OPEN_TRACK_TIP ),
|
||||
MakeWidget ({123, 132}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_O_SHAPED_TRACK, STR_RIDE_CONSTRUCTION_O_SHAPED_ENCLOSED_TRACK_TIP ),
|
||||
MakeWidget ({ 96, 120}, { 67, 41}, WWT_GROUPBOX, 0, STR_RIDE_CONSTRUCTION_SEAT_ROT ),
|
||||
MakeSpinnerWidgets({101, 138}, { 58, 12}, WWT_SPINNER, 1, 0, STR_RIDE_CONSTRUCTION_SELECT_SEAT_ROTATION_ANGLE_TIP),
|
||||
MakeWidget ({139, 338}, { 24, 24}, WWT_FLATBTN, 1, SPR_G2_SIMULATE, STR_SIMULATE_RIDE_TIP ),
|
||||
{ WIDGETS_END }
|
||||
};
|
||||
|
||||
|
||||
@@ -57,18 +57,18 @@ enum WINDOW_RIDE_LIST_WIDGET_IDX {
|
||||
|
||||
static rct_widget window_ride_list_widgets[] = {
|
||||
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
|
||||
{ WWT_RESIZE, 1, 0, 339, 43, 239, 0xFFFFFFFF, STR_NONE }, // tab page background
|
||||
{ WWT_FLATBTN, 1, 315, 338, 60, 83, SPR_TOGGLE_OPEN_CLOSE, STR_OPEN_OR_CLOSE_ALL_RIDES }, // open / close all toggle
|
||||
{ WWT_DROPDOWN, 1, 150, 273, 46, 57, 0xFFFFFFFF, STR_NONE }, // current information type
|
||||
{ WWT_BUTTON, 1, 262, 272, 47, 56, STR_DROPDOWN_GLYPH, STR_RIDE_LIST_INFORMATION_TYPE_TIP }, // information type dropdown button
|
||||
{ WWT_BUTTON, 1, 280, 333, 46, 57, STR_SORT, STR_RIDE_LIST_SORT_TIP }, // sort button
|
||||
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_LIST_RIDES_TIP }, // tab 1
|
||||
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_LIST_SHOPS_AND_STALLS_TIP }, // tab 2
|
||||
{ WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_LIST_KIOSKS_AND_FACILITIES_TIP }, // tab 3
|
||||
{ WWT_SCROLL, 1, 3, 336, 60, 236, SCROLL_VERTICAL, STR_NONE }, // list
|
||||
{ WWT_IMGBTN, 1, 320, 333, 62, 75, SPR_G2_RCT1_CLOSE_BUTTON_0, STR_NONE },
|
||||
{ WWT_IMGBTN, 1, 320, 333, 76, 89, SPR_G2_RCT1_OPEN_BUTTON_0, STR_NONE },
|
||||
{ WWT_FLATBTN, 1, 315, 338, 90, 113, SPR_DEMOLISH, STR_QUICK_DEMOLISH_RIDE },
|
||||
MakeWidget ({ 0, 43}, {340, 197}, WWT_RESIZE, 1 ), // tab page background
|
||||
MakeWidget ({315, 60}, { 24, 24}, WWT_FLATBTN, 1, SPR_TOGGLE_OPEN_CLOSE, STR_OPEN_OR_CLOSE_ALL_RIDES ), // open / close all toggle
|
||||
MakeWidget ({150, 46}, {124, 12}, WWT_DROPDOWN, 1 ), // current information type
|
||||
MakeWidget ({262, 47}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_RIDE_LIST_INFORMATION_TYPE_TIP), // information type dropdown button
|
||||
MakeWidget ({280, 46}, { 54, 12}, WWT_BUTTON, 1, STR_SORT, STR_RIDE_LIST_SORT_TIP ), // sort button
|
||||
MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_LIST_RIDES_TIP ), // tab 1
|
||||
MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_LIST_SHOPS_AND_STALLS_TIP ), // tab 2
|
||||
MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_LIST_KIOSKS_AND_FACILITIES_TIP), // tab 3
|
||||
MakeWidget ({ 3, 60}, {334, 177}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // list
|
||||
MakeWidget ({320, 62}, { 14, 14}, WWT_IMGBTN, 1, SPR_G2_RCT1_CLOSE_BUTTON_0 ),
|
||||
MakeWidget ({320, 76}, { 14, 14}, WWT_IMGBTN, 1, SPR_G2_RCT1_OPEN_BUTTON_0 ),
|
||||
MakeWidget ({315, 90}, { 24, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_QUICK_DEMOLISH_RIDE ),
|
||||
{ WIDGETS_END },
|
||||
};
|
||||
|
||||
|
||||
@@ -38,10 +38,10 @@ enum WINDOW_SAVE_PROMPT_WIDGET_IDX {
|
||||
|
||||
static rct_widget window_save_prompt_widgets[] = {
|
||||
WINDOW_SHIM_WHITE(STR_NONE, WW_SAVE, WH_SAVE),
|
||||
{ WWT_LABEL_CENTRED, 0, 2, 257, 19, 30, 0, STR_NONE }, // question/label
|
||||
{ WWT_BUTTON, 0, 8, 85, 35, 48, STR_SAVE_PROMPT_SAVE, STR_NONE }, // save
|
||||
{ WWT_BUTTON, 0, 91, 168, 35, 48, STR_SAVE_PROMPT_DONT_SAVE, STR_NONE }, // don't save
|
||||
{ WWT_BUTTON, 0, 174, 251, 35, 48, STR_SAVE_PROMPT_CANCEL, STR_NONE }, // cancel
|
||||
MakeWidget({ 2, 19}, {256, 12}, WWT_LABEL_CENTRED, 0, STR_EMPTY ), // question/label
|
||||
MakeWidget({ 8, 35}, { 78, 14}, WWT_BUTTON, 0, STR_SAVE_PROMPT_SAVE ), // save
|
||||
MakeWidget({ 91, 35}, { 78, 14}, WWT_BUTTON, 0, STR_SAVE_PROMPT_DONT_SAVE), // don't save
|
||||
MakeWidget({174, 35}, { 78, 14}, WWT_BUTTON, 0, STR_SAVE_PROMPT_CANCEL ), // cancel
|
||||
{ WIDGETS_END },
|
||||
};
|
||||
|
||||
|
||||
@@ -155,35 +155,35 @@ validate_global_widx(WC_SCENERY, WIDX_SCENERY_EYEDROPPER_BUTTON);
|
||||
|
||||
static rct_widget window_scenery_widgets[] = {
|
||||
WINDOW_SHIM(WINDOW_TITLE, WINDOW_SCENERY_WIDTH, WINDOW_SCENERY_HEIGHT),
|
||||
{ WWT_RESIZE, 1, 0, 633, 43, 141, 0xFFFFFFFF, STR_NONE }, // 8 0x009DE2C8
|
||||
{ WWT_TAB, 1, 3, 33, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 10 0x009DE2D8
|
||||
{ WWT_TAB, 1, 34, 64, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 20 0x009DE2E8
|
||||
{ WWT_TAB, 1, 65, 95, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 40 0x009DE2F8
|
||||
{ WWT_TAB, 1, 96, 126, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 80 0x009DE308
|
||||
{ WWT_TAB, 1, 127, 157, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 100 0x009DE318
|
||||
{ WWT_TAB, 1, 158, 188, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 200 0x009DE328
|
||||
{ WWT_TAB, 1, 189, 219, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 400 0x009DE338
|
||||
{ WWT_TAB, 1, 220, 250, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 800 0x009DE348
|
||||
{ WWT_TAB, 1, 251, 281, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 1000 0x009DE358
|
||||
{ WWT_TAB, 1, 282, 312, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 2000 0x009DE368
|
||||
{ WWT_TAB, 1, 313, 343, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 4000 0x009DE378
|
||||
{ WWT_TAB, 1, 344, 374, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 8000 0x009DE388
|
||||
{ WWT_TAB, 1, 375, 405, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 10000 0x009DE398
|
||||
{ WWT_TAB, 1, 406, 436, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 20000 0x009DE3A8
|
||||
{ WWT_TAB, 1, 437, 467, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 40000 0x009DE3B8
|
||||
{ WWT_TAB, 1, 468, 498, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 80000 0x009DE3C8
|
||||
{ WWT_TAB, 1, 468, 498, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 100000 0x009DE3D8
|
||||
{ WWT_TAB, 1, 468, 498, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 200000 0x009DE3E8
|
||||
{ WWT_TAB, 1, 468, 498, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 400000 0x009DE3F8
|
||||
{ WWT_TAB, 1, 468, 498, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB_QUESTION, STR_STRING_DEFINED_TOOLTIP }, // 800000 0x009DE408
|
||||
{ WWT_SCROLL, 1, 2, 608, 47, 126, SCROLL_VERTICAL, STR_NONE }, // 1000000 0x009DE418
|
||||
{ WWT_FLATBTN, 1, 609, 632, 44, 67, SPR_ROTATE_ARROW, STR_ROTATE_OBJECTS_90 }, // 2000000 0x009DE428
|
||||
{ WWT_FLATBTN, 1, 609, 632, 68, 91, SPR_PAINTBRUSH, STR_SCENERY_PAINTBRUSH_TIP }, // 4000000 0x009DE438
|
||||
{ WWT_COLOURBTN, 1, 615, 626, 93, 104, 0xFFFFFFFF, STR_SELECT_COLOUR }, // 8000000 0x009DE448
|
||||
{ WWT_COLOURBTN, 1, 615, 626, 105, 116, 0xFFFFFFFF, STR_SELECT_SECONDARY_COLOUR }, // 10000000 0x009DE458
|
||||
{ WWT_COLOURBTN, 1, 615, 626, 117, 128, 0xFFFFFFFF, STR_SELECT_TERNARY_COLOUR }, // 20000000 0x009DE468
|
||||
{ WWT_FLATBTN, 1, 609, 632, 130, 153, SPR_G2_EYEDROPPER, STR_SCENERY_EYEDROPPER_TIP }, // 40000000 0x009DE478
|
||||
{ WWT_FLATBTN, 1, 609, 632, 154, 177, SPR_SCENERY_CLUSTER, STR_SCENERY_CLUSTER_TIP }, // 40000000 0x009DE478
|
||||
MakeWidget ({ 0, 43}, {634, 99}, WWT_RESIZE, 1 ), // 8 0x009DE2C8
|
||||
MakeWidget ({ 3, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 10 0x009DE2D8
|
||||
MakeWidget ({ 34, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 20 0x009DE2E8
|
||||
MakeWidget ({ 65, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 40 0x009DE2F8
|
||||
MakeWidget ({ 96, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 80 0x009DE308
|
||||
MakeWidget ({127, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 100 0x009DE318
|
||||
MakeWidget ({158, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 200 0x009DE328
|
||||
MakeWidget ({189, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 400 0x009DE338
|
||||
MakeWidget ({220, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 800 0x009DE348
|
||||
MakeWidget ({251, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 1000 0x009DE358
|
||||
MakeWidget ({282, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 2000 0x009DE368
|
||||
MakeWidget ({313, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 4000 0x009DE378
|
||||
MakeWidget ({344, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 8000 0x009DE388
|
||||
MakeWidget ({375, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 10000 0x009DE398
|
||||
MakeWidget ({406, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 20000 0x009DE3A8
|
||||
MakeWidget ({437, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 40000 0x009DE3B8
|
||||
MakeWidget ({468, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 80000 0x009DE3C8
|
||||
MakeWidget ({468, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 100000 0x009DE3D8
|
||||
MakeWidget ({468, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 200000 0x009DE3E8
|
||||
MakeWidget ({468, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 400000 0x009DE3F8
|
||||
MakeRemapWidget({468, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB_QUESTION, STR_STRING_DEFINED_TOOLTIP ), // 800000 0x009DE408
|
||||
MakeWidget ({ 2, 47}, {607, 80}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // 1000000 0x009DE418
|
||||
MakeWidget ({609, 44}, { 24, 24}, WWT_FLATBTN, 1, SPR_ROTATE_ARROW, STR_ROTATE_OBJECTS_90 ), // 2000000 0x009DE428
|
||||
MakeWidget ({609, 68}, { 24, 24}, WWT_FLATBTN, 1, SPR_PAINTBRUSH, STR_SCENERY_PAINTBRUSH_TIP ), // 4000000 0x009DE438
|
||||
MakeWidget ({615, 93}, { 12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_COLOUR ), // 8000000 0x009DE448
|
||||
MakeWidget ({615, 105}, { 12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_SECONDARY_COLOUR), // 10000000 0x009DE458
|
||||
MakeWidget ({615, 117}, { 12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_TERNARY_COLOUR ), // 20000000 0x009DE468
|
||||
MakeWidget ({609, 130}, { 24, 24}, WWT_FLATBTN, 1, SPR_G2_EYEDROPPER, STR_SCENERY_EYEDROPPER_TIP ), // 40000000 0x009DE478
|
||||
MakeWidget ({609, 154}, { 24, 24}, WWT_FLATBTN, 1, SPR_SCENERY_CLUSTER, STR_SCENERY_CLUSTER_TIP ), // 40000000 0x009DE478
|
||||
{ WIDGETS_END },
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
@@ -35,18 +35,18 @@ ScatterToolDensity gWindowSceneryScatterDensity;
|
||||
|
||||
// clang-format off
|
||||
static rct_widget window_scenery_scatter_widgets[] = {
|
||||
{ WWT_FRAME, 1, 0, 85, 0, 99, 0xFFFFFFFF, STR_NONE }, // panel / background
|
||||
{ WWT_CAPTION, 0, 1, 84, 1, 14, STR_SCENERY_SCATTER, STR_WINDOW_TITLE_TIP }, // title bar
|
||||
{ WWT_CLOSEBOX, 0, 73, 83, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button
|
||||
MakeWidget ({ 0, 0}, {86, 100}, WWT_FRAME, 1 ), // panel / background
|
||||
MakeWidget ({ 1, 1}, {84, 14}, WWT_CAPTION, 0, STR_SCENERY_SCATTER, STR_WINDOW_TITLE_TIP ), // title bar
|
||||
MakeWidget ({73, 2}, {11, 12}, WWT_CLOSEBOX, 0, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP ), // close x button
|
||||
|
||||
{ WWT_IMGBTN, 1, 20, 63, 17, 48, SPR_LAND_TOOL_SIZE_0, STR_NONE }, // preview box
|
||||
{ WWT_TRNBTN, 1, 21, 36, 18, 33, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP }, // decrement size
|
||||
{ WWT_TRNBTN, 1, 47, 62, 32, 47, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP }, // increment size
|
||||
MakeWidget ({20, 17}, {44, 32}, WWT_IMGBTN, 1, SPR_LAND_TOOL_SIZE_0 ), // preview box
|
||||
MakeRemapWidget({21, 18}, {16, 16}, WWT_TRNBTN, 1, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP ), // decrement size
|
||||
MakeRemapWidget({47, 32}, {16, 16}, WWT_TRNBTN, 1, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP ), // increment size
|
||||
|
||||
{ WWT_GROUPBOX, 1, 3, 82, 55, 96, STR_SCATTER_TOOL_DENSITY, STR_NONE },
|
||||
{ WWT_FLATBTN, 1, 7, 30, 68, 91, IMAGE_TYPE_REMAP | SPR_G2_SCENERY_SCATTER_LOW, STR_SCATTER_TOOL_DENSITY_LOW }, // low amount
|
||||
{ WWT_FLATBTN, 1, 31, 54, 68, 91, IMAGE_TYPE_REMAP | SPR_G2_SCENERY_SCATTER_MEDIUM, STR_SCATTER_TOOL_DENSITY_MEDIUM }, // medium amount
|
||||
{ WWT_FLATBTN, 1, 55, 78, 68, 91, IMAGE_TYPE_REMAP | SPR_G2_SCENERY_SCATTER_HIGH, STR_SCATTER_TOOL_DENSITY_HIGH }, // high amount
|
||||
MakeWidget ({ 3, 55}, {80, 42}, WWT_GROUPBOX, 1, STR_SCATTER_TOOL_DENSITY ),
|
||||
MakeRemapWidget({ 7, 68}, {24, 24}, WWT_FLATBTN, 1, SPR_G2_SCENERY_SCATTER_LOW, STR_SCATTER_TOOL_DENSITY_LOW ), // low amount
|
||||
MakeRemapWidget({31, 68}, {24, 24}, WWT_FLATBTN, 1, SPR_G2_SCENERY_SCATTER_MEDIUM, STR_SCATTER_TOOL_DENSITY_MEDIUM), // medium amount
|
||||
MakeRemapWidget({55, 68}, {24, 24}, WWT_FLATBTN, 1, SPR_G2_SCENERY_SCATTER_HIGH, STR_SCATTER_TOOL_DENSITY_HIGH ), // high amount
|
||||
{ WIDGETS_END },
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
@@ -58,14 +58,14 @@ enum {
|
||||
};
|
||||
|
||||
static rct_widget window_server_list_widgets[] = {
|
||||
{ WWT_FRAME, 0, 0, 340, 0, 90, STR_NONE, STR_NONE }, // panel / background
|
||||
{ WWT_CAPTION, 0, 1, 338, 1, 14, STR_SERVER_LIST, STR_WINDOW_TITLE_TIP }, // title bar
|
||||
{ WWT_CLOSEBOX, 0, 327, 337, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button
|
||||
{ WWT_TEXT_BOX, 1, 100, 344, 20, 31, STR_NONE, STR_NONE }, // player name text box
|
||||
{ WWT_SCROLL, 1, 6, 337, 37, 50, STR_NONE, STR_NONE }, // server list
|
||||
{ WWT_BUTTON, 1, 6, 106, 53, 66, STR_FETCH_SERVERS, STR_NONE }, // fetch servers button
|
||||
{ WWT_BUTTON, 1, 112, 212, 53, 66, STR_ADD_SERVER, STR_NONE }, // add server button
|
||||
{ WWT_BUTTON, 1, 218, 318, 53, 66, STR_START_SERVER, STR_NONE }, // start server button
|
||||
MakeWidget({ 0, 0}, {341, 91}, WWT_FRAME, 0 ), // panel / background
|
||||
MakeWidget({ 1, 1}, {338, 14}, WWT_CAPTION, 0, STR_SERVER_LIST, STR_WINDOW_TITLE_TIP), // title bar
|
||||
MakeWidget({327, 2}, { 11, 12}, WWT_CLOSEBOX, 0, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP), // close x button
|
||||
MakeWidget({100, 20}, {245, 12}, WWT_TEXT_BOX, 1 ), // player name text box
|
||||
MakeWidget({ 6, 37}, {332, 14}, WWT_SCROLL, 1 ), // server list
|
||||
MakeWidget({ 6, 53}, {101, 14}, WWT_BUTTON, 1, STR_FETCH_SERVERS ), // fetch servers button
|
||||
MakeWidget({112, 53}, {101, 14}, WWT_BUTTON, 1, STR_ADD_SERVER ), // add server button
|
||||
MakeWidget({218, 53}, {101, 14}, WWT_BUTTON, 1, STR_START_SERVER ), // start server button
|
||||
{ WIDGETS_END },
|
||||
};
|
||||
|
||||
|
||||
@@ -50,18 +50,18 @@ static constexpr const int32_t WW = 300;
|
||||
static constexpr const int32_t WH = 154;
|
||||
|
||||
static rct_widget window_server_start_widgets[] = {
|
||||
{ WWT_FRAME, 0, 0, WW-1, 0, WH-1, STR_NONE, STR_NONE }, // panel / background
|
||||
{ WWT_CAPTION, 0, 1, WW-2, 1, 14, STR_START_SERVER, STR_WINDOW_TITLE_TIP }, // title bar
|
||||
{ WWT_CLOSEBOX, 0, WW-13, WW-3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button
|
||||
{ WWT_TEXT_BOX, 1, 120, WW-8, 20, 32, STR_NONE, STR_NONE }, // port text box
|
||||
{ WWT_TEXT_BOX, 1, 120, WW-8, 36, 48, STR_NONE, STR_NONE }, // name text box
|
||||
{ WWT_TEXT_BOX, 1, 120, WW-8, 52, 64, STR_NONE, STR_NONE }, // description text box
|
||||
{ WWT_TEXT_BOX, 1, 120, WW-8, 68, 80, STR_NONE, STR_NONE }, // greeting text box
|
||||
{ WWT_TEXT_BOX, 1, 120, WW-8, 84, 96, STR_NONE, STR_NONE }, // password text box
|
||||
SPINNER_WIDGETS (1, 120, WW-8, 100, 111, STR_SERVER_MAX_PLAYERS_VALUE, STR_NONE), // max players (3 widgets)
|
||||
{ WWT_CHECKBOX, 1, 6, WW-8, 117, 130, STR_ADVERTISE, STR_ADVERTISE_SERVER_TIP }, // advertise checkbox
|
||||
{ WWT_BUTTON, 1, 6, 106, WH-6-13, WH-6, STR_NEW_GAME, STR_NONE }, // start server button
|
||||
{ WWT_BUTTON, 1, 112, 212, WH-6-13, WH-6, STR_LOAD_GAME, STR_NONE },
|
||||
MakeWidget ({ 0, 0}, { WW, WH}, WWT_FRAME, 0 ), // panel / background
|
||||
MakeWidget ({ 1, 1}, {298, 14}, WWT_CAPTION, 0, STR_START_SERVER, STR_WINDOW_TITLE_TIP ), // title bar
|
||||
MakeWidget ({WW-13, 2}, { 11, 12}, WWT_CLOSEBOX, 0, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP ), // close x button
|
||||
MakeWidget ({ 120, 20}, {173, 13}, WWT_TEXT_BOX, 1 ), // port text box
|
||||
MakeWidget ({ 120, 36}, {173, 13}, WWT_TEXT_BOX, 1 ), // name text box
|
||||
MakeWidget ({ 120, 52}, {173, 13}, WWT_TEXT_BOX, 1 ), // description text box
|
||||
MakeWidget ({ 120, 68}, {173, 13}, WWT_TEXT_BOX, 1 ), // greeting text box
|
||||
MakeWidget ({ 120, 84}, {173, 13}, WWT_TEXT_BOX, 1 ), // password text box
|
||||
MakeSpinnerWidgets({ 120, 100}, {173, 12}, WWT_SPINNER, 1, STR_SERVER_MAX_PLAYERS_VALUE ), // max players (3 widgets)
|
||||
MakeWidget ({ 6, 117}, {287, 14}, WWT_CHECKBOX, 1, STR_ADVERTISE, STR_ADVERTISE_SERVER_TIP), // advertise checkbox
|
||||
MakeWidget ({ 6, WH-6-13}, {101, 14}, WWT_BUTTON, 1, STR_NEW_GAME ), // start server button
|
||||
MakeWidget ({ 112, WH-6-13}, {101, 14}, WWT_BUTTON, 1, STR_LOAD_GAME ), // None
|
||||
{ WIDGETS_END },
|
||||
};
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@ enum WINDOW_SHORTCUT_WIDGET_IDX {
|
||||
// 0x9DE48C
|
||||
static rct_widget window_shortcut_widgets[] = {
|
||||
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
|
||||
{ WWT_SCROLL, 0, 4, WW - 5, 18, WH - 18, SCROLL_VERTICAL, STR_SHORTCUT_LIST_TIP },
|
||||
{ WWT_BUTTON, 0, 4, 153, WH-15, WH - 4, STR_SHORTCUT_ACTION_RESET, STR_SHORTCUT_ACTION_RESET_TIP },
|
||||
MakeWidget({4, 18}, {412, 245}, WWT_SCROLL, 0, SCROLL_VERTICAL, STR_SHORTCUT_LIST_TIP ),
|
||||
MakeWidget({4, WH-15}, {150, 12}, WWT_BUTTON, 0, STR_SHORTCUT_ACTION_RESET, STR_SHORTCUT_ACTION_RESET_TIP),
|
||||
{ WIDGETS_END }
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user