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

Exit scenery selection mode when done saving

This commit is contained in:
Sijmen Schoon 2016-07-11 16:00:40 +02:00
parent 79a85cd659
commit d8bc890d0a
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ride/ride.h
View File

@ -1100,6 +1100,7 @@ bool shop_item_is_souvenir(int shopItem);
void ride_reset_all_names();
const uint8* ride_seek_available_modes(rct_ride *ride);
void window_ride_measurements_design_cancel();
void window_ride_construction_mouseup_demolish_next_piece(int x, int y, int z, int direction, int type);
const uint32 ride_customers_per_hour(const rct_ride *ride);

3
src/windows/loadsave.c
View File

@ -910,6 +910,7 @@ static void window_loadsave_select(rct_window *w, const char *path)
if (success) {
window_close_by_class(WC_LOADSAVE);
window_ride_measurements_design_cancel();
window_loadsave_invoke_callback(MODAL_RESULT_OK);
} else {
window_error_open(STR_FILE_DIALOG_TITLE_SAVE_TRACK, STR_TRACK_SAVE_FAILED);
@ -982,7 +983,7 @@ static char _window_overwrite_prompt_path[MAX_PATH];
static rct_window *window_overwrite_prompt_open(const char *name, const char *path)
{
rct_window *w;
window_close_by_class(WC_LOADSAVE_OVERWRITE_PROMPT);
w = window_create_centred(OVERWRITE_WW, OVERWRITE_WH, &window_overwrite_prompt_events, WC_LOADSAVE_OVERWRITE_PROMPT, WF_STICK_TO_FRONT);

2
src/windows/ride.c
View File

@ -4690,7 +4690,7 @@ static void window_ride_measurements_design_select_nearby_scenery()
*
* rct2: 0x006AD4DA
*/
static void window_ride_measurements_design_cancel()
void window_ride_measurements_design_cancel()
{
if (RCT2_GLOBAL(0x009DEA6F, uint8) & 1)
cancel_scenery_selection();