diff --git a/src/strings.h b/src/strings.h index acfcd2ca76..74e62f6e3e 100644 --- a/src/strings.h +++ b/src/strings.h @@ -250,6 +250,8 @@ enum { STR_NUMERIC_UP = 1218, STR_NUMERIC_DOWN = 1219, + STR_ROTATE_OBJECTS_90 = 1327, + STR_BUILD_THIS = 1407, STR_COST_LABEL = 1408, @@ -460,6 +462,7 @@ enum { STR_TOTAL_ADMISSIONS = 2800, STR_INCOME_FROM_ADMISSIONS = 2801, + STR_MAP = 2802, STR_SHOW_GUESTS_ON_MAP_TIP = 2803, STR_SHOW_MAP_TIP = 2805, @@ -538,9 +541,26 @@ enum { STR_SCROLL_DOWN_FAST_TIP = STR_SCROLL_LEFT_TIP + 8, STR_SCROLL_UP_DOWN_TIP = STR_SCROLL_LEFT_TIP + 9, + STR_SHOW_PEOPLE_ON_MAP_TIP = 3143, + STR_SHOW_RIDES_STALLS_ON_MAP_TIP = 3144, STR_LIST = 3159, + STR_SELECT_PARK_OWNED_LAND_TIP = 3216, + + STR_LAND_OWNED = 3217, + STR_CONSTRUCTION_RIGHTS_OWNED = 3218, + STR_LAND_SALE = 3219, + STR_CONSTRUCTION_RIGHTS_SALE = 3220, + STR_SET_LAND_TO_BE_OWNED_TIP = 3221, + STR_SET_CONSTRUCTION_RIGHTS_TO_BE_OWNED_TIP = 3222, + STR_SET_LAND_TO_BE_AVAILABLE_TIP = 3223, + STR_SET_CONSTRUCTION_RIGHTS_TO_BE_AVAILABLE_TIP = 3224, + + STR_BUILD_PARK_ENTRANCE_TIP = 3226, + + STR_SET_STARTING_POSITIONS_TIP = 3228, + STR_NO_DETAILS_YET = 3317, STR_OBJECTIVE = 3322, diff --git a/src/widget.c b/src/widget.c index f286139c41..33be565a97 100644 --- a/src/widget.c +++ b/src/widget.c @@ -135,7 +135,7 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) case WWT_14: widget_text(dpi, w, widgetIndex); break; - case WWT_15: + case WWT_SPINNER: case WWT_DROPDOWN: case WWT_VIEWPORT: widget_text_inset(dpi, w, widgetIndex); diff --git a/src/widget.h b/src/widget.h index 0f269bc724..25215d09d9 100644 --- a/src/widget.h +++ b/src/widget.h @@ -39,7 +39,7 @@ typedef enum { WWT_12, WWT_13, WWT_14, - WWT_15, + WWT_SPINNER = 15, WWT_DROPDOWN = 16, WWT_VIEWPORT = 17, WWT_18, @@ -47,7 +47,7 @@ typedef enum { WWT_CAPTION = 20, WWT_CLOSEBOX = 21, WWT_SCROLL = 22, - WWT_CHECKBOX, + WWT_CHECKBOX = 23, WWT_24, WWT_25, WWT_LAST = 26, diff --git a/src/window_map.c b/src/window_map.c index 4d50d0cecb..e8fdb94b31 100644 --- a/src/window_map.c +++ b/src/window_map.c @@ -19,6 +19,7 @@ *****************************************************************************/ #include "addresses.h" +#include "sprites.h" #include "strings.h" #include "widget.h" #include "window.h" @@ -30,9 +31,27 @@ static enum WINDOW_MAP_WIDGET_IDX { }; static rct_widget window_map_widgets[] = { - { WWT_FRAME, 0, 0, 309, 0, 371, STR_NONE, STR_NONE }, - { WWT_CAPTION, 0, 1, 308, 1, 14, STR_OPTIONS, STR_WINDOW_TITLE_TIP }, - { WWT_CLOSEBOX, 0, 297, 307, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, + { WWT_FRAME, 0, 0, 244, 0, 258, STR_NONE, STR_NONE }, + { WWT_CAPTION, 0, 1, 243, 1, 14, STR_MAP, STR_WINDOW_TITLE_TIP }, + { WWT_CLOSEBOX, 0, 232, 242, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, + { WWT_RESIZE, 1, 0, 244, 43, 257, STR_NONE, STR_NONE }, + { WWT_COLORBTN, 1, 3, 33, 17, 43, 0x02000144E, STR_SHOW_PEOPLE_ON_MAP_TIP }, + { WWT_COLORBTN, 1, 34, 64, 17, 43, 0x02000144E, STR_SHOW_RIDES_STALLS_ON_MAP_TIP }, + { WWT_SCROLL, 1, 3, 241, 46, 225, 0x3, STR_NONE }, + { WWT_SPINNER, 1, 104, 198, 229, 240, 0xC8C, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, 187, 197, 230, 234, STR_NUMERIC_UP, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, 187, 197, 235, 239, STR_NUMERIC_DOWN, STR_NONE }, + { WWT_FLATBTN, 1, 4, 27, 1, 24, SPR_BUY_LAND_RIGHTS, STR_SELECT_PARK_OWNED_LAND_TIP }, + { WWT_FLATBTN, 1, 4, 27, 1, 24, SPR_BUY_CONSTRUCTION_RIGHTS, STR_BUILD_PARK_ENTRANCE_TIP }, + { WWT_FLATBTN, 1, 28, 51, 1, 24, STR_NONE, STR_SET_STARTING_POSITIONS_TIP }, + { WWT_IMGBTN, 1, 4, 47, 17, 48, SPR_LAND_TOOL_SIZE_0, STR_NONE }, + { WWT_TRNBTN, 1, 5, 20, 18, 33, 0x02000157B, STR_ADJUST_SMALLER_LAND_TIP }, + { WWT_TRNBTN, 1, 31, 46, 32, 47, 0x02000157D, STR_ADJUST_LARGER_LAND_TIP }, + { WWT_CHECKBOX, 1, 58, 241, 197, 208, STR_LAND_OWNED, STR_SET_LAND_TO_BE_OWNED_TIP }, + { WWT_CHECKBOX, 1, 58, 241, 197, 208, STR_CONSTRUCTION_RIGHTS_OWNED, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_OWNED_TIP }, + { WWT_CHECKBOX, 1, 58, 241, 197, 208, STR_LAND_SALE, STR_SET_LAND_TO_BE_AVAILABLE_TIP }, + { WWT_CHECKBOX, 1, 58, 231, 197, 208, STR_CONSTRUCTION_RIGHTS_SALE, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_AVAILABLE_TIP }, + { WWT_FLATBTN, 1, 218, 241, 45, 68, SPR_ROTATE_ARROW, STR_ROTATE_OBJECTS_90 }, { WIDGETS_END }, }; diff --git a/src/window_park.c b/src/window_park.c index d73576d8d0..7cddbeca7a 100644 --- a/src/window_park.c +++ b/src/window_park.c @@ -144,7 +144,7 @@ static rct_widget window_park_price_widgets[] = { { WWT_24, 1, 7, 146, 50, 61, STR_ADMISSION_PRICE, STR_NONE }, // - { WWT_15, 1, 147, 222, 50, 61, 0x595, STR_NONE }, // price + { WWT_SPINNER, 1, 147, 222, 50, 61, 0x595, STR_NONE }, // price { WWT_DROPDOWN_BUTTON, 1, 211, 221, 51, 55, STR_NUMERIC_UP, STR_NONE }, // increase price { WWT_DROPDOWN_BUTTON, 1, 211, 221, 56, 60, STR_NUMERIC_DOWN, STR_NONE }, // decrease price { WIDGETS_END }, @@ -1476,7 +1476,7 @@ static void window_park_price_invalidate() window_park_price_widgets[WIDX_INCREASE_PRICE].type = WWT_EMPTY; window_park_price_widgets[WIDX_DECREASE_PRICE].type = WWT_EMPTY; } else { - window_park_price_widgets[WIDX_PRICE].type = WWT_15; + window_park_price_widgets[WIDX_PRICE].type = WWT_SPINNER; window_park_price_widgets[WIDX_INCREASE_PRICE].type = WWT_DROPDOWN_BUTTON; window_park_price_widgets[WIDX_DECREASE_PRICE].type = WWT_DROPDOWN_BUTTON; }