From fb456a86eae89b17bd890bf3dad6f504b4a3b657 Mon Sep 17 00:00:00 2001 From: Sijmen Schoon Date: Thu, 14 Jul 2016 12:26:12 +0200 Subject: [PATCH] Fix #4061: Wrong error message when opening all rides with unfinished rides Show the proper error when opening all rides goes wrong. --- src/windows/ride_list.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/windows/ride_list.c b/src/windows/ride_list.c index 7da00cdd5e..8624b19732 100644 --- a/src/windows/ride_list.c +++ b/src/windows/ride_list.c @@ -877,8 +877,10 @@ static void window_ride_list_close_all(rct_window *w) continue; if (ride->status == RIDE_STATUS_CLOSED) continue; - set_format_arg(6, uint16, w->scrolls[0].v_top); - set_format_arg(8, uint32, w->scrolls[0].v_bottom); + + gGameCommandErrorTitle = STR_CANT_CLOSE; + set_format_arg(6, uint16, ride->name); + set_format_arg(8, uint32, ride->name_arguments); ride_set_status(i, RIDE_STATUS_CLOSED); } @@ -894,8 +896,10 @@ static void window_ride_list_open_all(rct_window *w) continue; if (ride->status == RIDE_STATUS_OPEN) continue; - set_format_arg(6, uint16, w->scrolls[0].v_top); - set_format_arg(8, uint32, w->scrolls[0].v_bottom); + + gGameCommandErrorTitle = STR_CANT_OPEN; + set_format_arg(6, uint16, ride->name); + set_format_arg(8, uint32, ride->name_arguments); ride_set_status(i, RIDE_STATUS_OPEN); }