mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1137 from Gymnasiast/exit_openrct2 

Add option to exit OpenRCT2 directly
This commit is contained in:
Ted John 2015-05-23 15:08:06 +01:00
parent d145711d37 81272f5ab7
commit 36204e5fba
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/language/english_uk.txt
View File

@ -3491,3 +3491,5 @@ STR_5154 :Hardware display
STR_5155 :Allow testing of unfinished tracks STR_5155 :Allow testing of unfinished tracks
STR_5156 :{SMALLFONT}{BLACK}Allows testing of most ride types even when the track is unfinished, does not apply to block sectioned modes STR_5156 :{SMALLFONT}{BLACK}Allows testing of most ride types even when the track is unfinished, does not apply to block sectioned modes
STR_5157 :Unlock all prices STR_5157 :Unlock all prices
STR_5158 :Quit to menu
STR_5159 :Exit OpenRCT2

2
src/localisation/string_ids.h
View File

@ -113,6 +113,8 @@ enum {
STR_LOAD_LANDSCAPE = 884, STR_LOAD_LANDSCAPE = 884,
STR_SAVE_LANDSCAPE = 885, STR_SAVE_LANDSCAPE = 885,
STR_QUIT_GAME = 886, STR_QUIT_GAME = 886,
STR_QUIT_TO_MENU = 5158,
STR_EXIT_OPENRCT2 = 5159,
STR_QUIT_SCENARIO_EDITOR = 887, STR_QUIT_SCENARIO_EDITOR = 887,
STR_QUIT_ROLLERCOASTER_DESIGNER = 888, STR_QUIT_ROLLERCOASTER_DESIGNER = 888,
STR_QUIT_TRACK_DESIGNS_MANAGER = 889, STR_QUIT_TRACK_DESIGNS_MANAGER = 889,

19
src/windows/top_toolbar.c
View File

@ -68,7 +68,8 @@ typedef enum {
DDIDX_ABOUT = 3, DDIDX_ABOUT = 3,
DDIDX_OPTIONS = 4, DDIDX_OPTIONS = 4,
DDIDX_SCREENSHOT = 5, DDIDX_SCREENSHOT = 5,
DDIDX_QUIT_GAME = 7, DDIDX_QUIT_TO_MENU = 7,
DDIDX_EXIT_OPENRCT2 = 8,
} FILE_MENU_DDIDX; } FILE_MENU_DDIDX;
typedef enum { typedef enum {
@ -311,11 +312,12 @@ static void window_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widg
gDropdownItemsFormat[2] = STR_SCREENSHOT; gDropdownItemsFormat[2] = STR_SCREENSHOT;
gDropdownItemsFormat[3] = 0; gDropdownItemsFormat[3] = 0;
gDropdownItemsFormat[4] = STR_QUIT_TRACK_DESIGNS_MANAGER; gDropdownItemsFormat[4] = STR_QUIT_TRACK_DESIGNS_MANAGER;
gDropdownItemsFormat[5] = STR_EXIT_OPENRCT2;
if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER) if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER)
gDropdownItemsFormat[4] = STR_QUIT_ROLLERCOASTER_DESIGNER; gDropdownItemsFormat[4] = STR_QUIT_ROLLERCOASTER_DESIGNER;
numItems = 5; numItems = 6;
} else if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_SCENARIO_EDITOR) { } else if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_SCENARIO_EDITOR) {
gDropdownItemsFormat[0] = STR_LOAD_LANDSCAPE; gDropdownItemsFormat[0] = STR_LOAD_LANDSCAPE;
gDropdownItemsFormat[1] = STR_SAVE_LANDSCAPE; gDropdownItemsFormat[1] = STR_SAVE_LANDSCAPE;
@ -325,7 +327,8 @@ static void window_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widg
gDropdownItemsFormat[5] = STR_SCREENSHOT; gDropdownItemsFormat[5] = STR_SCREENSHOT;
gDropdownItemsFormat[6] = 0; gDropdownItemsFormat[6] = 0;
gDropdownItemsFormat[7] = STR_QUIT_SCENARIO_EDITOR; gDropdownItemsFormat[7] = STR_QUIT_SCENARIO_EDITOR;
numItems = 8; gDropdownItemsFormat[8] = STR_EXIT_OPENRCT2;
numItems = 9;
} else { } else {
gDropdownItemsFormat[0] = STR_LOAD_GAME; gDropdownItemsFormat[0] = STR_LOAD_GAME;
gDropdownItemsFormat[1] = STR_SAVE_GAME; gDropdownItemsFormat[1] = STR_SAVE_GAME;
@ -334,8 +337,9 @@ static void window_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widg
gDropdownItemsFormat[4] = STR_OPTIONS; gDropdownItemsFormat[4] = STR_OPTIONS;
gDropdownItemsFormat[5] = STR_SCREENSHOT; gDropdownItemsFormat[5] = STR_SCREENSHOT;
gDropdownItemsFormat[6] = 0; gDropdownItemsFormat[6] = 0;
gDropdownItemsFormat[7] = STR_QUIT_GAME; gDropdownItemsFormat[7] = STR_QUIT_TO_MENU;
numItems = 8; gDropdownItemsFormat[8] = STR_EXIT_OPENRCT2;
numItems = 9;
} }
window_dropdown_show_text( window_dropdown_show_text(
w->x + widget->left, w->x + widget->left,
@ -413,11 +417,14 @@ static void window_top_toolbar_dropdown()
case DDIDX_SCREENSHOT: case DDIDX_SCREENSHOT:
RCT2_GLOBAL(RCT2_ADDRESS_SCREENSHOT_COUNTDOWN, sint8) = 10; RCT2_GLOBAL(RCT2_ADDRESS_SCREENSHOT_COUNTDOWN, sint8) = 10;
break; break;
case DDIDX_QUIT_GAME: case DDIDX_QUIT_TO_MENU:
window_close_by_class(WC_MANAGE_TRACK_DESIGN); window_close_by_class(WC_MANAGE_TRACK_DESIGN);
window_close_by_class(WC_TRACK_DELETE_PROMPT); window_close_by_class(WC_TRACK_DELETE_PROMPT);
game_do_command(0, 1, 0, 0, GAME_COMMAND_LOAD_OR_QUIT, 1, 0); game_do_command(0, 1, 0, 0, GAME_COMMAND_LOAD_OR_QUIT, 1, 0);
break; break;
case DDIDX_EXIT_OPENRCT2:
rct2_quit();
break;
} }
break; break;
case WIDX_VIEW_MENU: case WIDX_VIEW_MENU: