From 831bc6b3bd835c95e2c1953807cba3d7d1c740c6 Mon Sep 17 00:00:00 2001 From: Maikel Stuivenberg Date: Fri, 26 Jun 2015 01:21:35 +0200 Subject: [PATCH] Added a back button on "Select Design" list #1346 --- data/language/english_uk.txt | 1 + src/localisation/string_ids.h | 1 + src/windows/track_list.c | 12 ++++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 0a2e5fd020..3faec4c51d 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -3780,3 +3780,4 @@ STR_5443 :Speed{MOVE_X}{87}{STRINGID} STR_5444 :Speed: STR_5445 :Speed STR_5446 :Get +STR_5447 :{SMALLFONT}{BLACK}Select an other ride/attraction diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index a1029e0da5..73088a384e 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -805,6 +805,7 @@ enum { STR_SELECT_DESIGN = 2307, STR_TRACK_DESIGNS = 2308, STR_BUILD_CUSTOM_DESIGN = 2310, + STR_SELECT_OTHER_RIDE = 5447, STR_TRACK_LIST_EXCITEMENT_RATING = 2311, STR_TRACK_LIST_INTENSITY_RATING = 2312, diff --git a/src/windows/track_list.c b/src/windows/track_list.c index d60afdfae5..71bd536325 100644 --- a/src/windows/track_list.c +++ b/src/windows/track_list.c @@ -38,7 +38,8 @@ enum { WIDX_TRACK_LIST, WIDX_TRACK_PREVIEW, WIDX_ROTATE, - WIDX_TOGGLE_SCENERY + WIDX_TOGGLE_SCENERY, + WIDX_BACK, }; static rct_widget window_track_list_widgets[] = { @@ -49,6 +50,7 @@ static rct_widget window_track_list_widgets[] = { { WWT_FLATBTN, 0, 224, 595, 18, 236, 0xFFFFFFFF, STR_NONE }, { WWT_FLATBTN, 0, 574, 597, 374, 397, 5169, STR_ROTATE_90_TIP }, { WWT_FLATBTN, 0, 574, 597, 350, 373, 5171, STR_TOGGLE_SCENERY_TIP }, + { WWT_FLATBTN, 0, 574, 597, 326, 349, SPR_PREVIOUS, STR_SELECT_OTHER_RIDE }, { WIDGETS_END }, }; @@ -136,7 +138,7 @@ void window_track_list_open(ride_list_item item) 0 ); w->widgets = window_track_list_widgets; - w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_ROTATE) | (1 << WIDX_TOGGLE_SCENERY); + w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_ROTATE) | (1 << WIDX_TOGGLE_SCENERY) | (1 << WIDX_BACK); window_init_scroll_widgets(w); w->track_list.var_480 = 0xFFFF; w->track_list.var_482 = RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_MANAGER ? 0 : 1; @@ -266,6 +268,10 @@ static void window_track_list_mouseup() reset_track_list_cache(); window_invalidate(w); break; + case WIDX_BACK: + window_close(w); + window_new_ride_open(); + break; } } @@ -376,6 +382,7 @@ static void window_track_list_invalidate() w->disabled_widgets &= ~(1 << WIDX_TRACK_PREVIEW); window_track_list_widgets[WIDX_ROTATE].type = WWT_FLATBTN; window_track_list_widgets[WIDX_TOGGLE_SCENERY].type = WWT_FLATBTN; + window_track_list_widgets[WIDX_BACK].type = WWT_FLATBTN; if (RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_SCENERY_TOGGLE, uint8) == 0) w->pressed_widgets |= (1 << WIDX_TOGGLE_SCENERY); else @@ -385,6 +392,7 @@ static void window_track_list_invalidate() w->disabled_widgets |= (1 << WIDX_TRACK_PREVIEW); window_track_list_widgets[WIDX_ROTATE].type = WWT_EMPTY; window_track_list_widgets[WIDX_TOGGLE_SCENERY].type = WWT_EMPTY; + window_track_list_widgets[WIDX_BACK].type = WWT_EMPTY; } }