From 35b38f3c16e78fc20009df0f7112131bc7417eb0 Mon Sep 17 00:00:00 2001 From: lnz Date: Fri, 30 May 2014 00:12:29 +0200 Subject: [PATCH] Remove debug statements and add string_ids for ride connected functions. --- src/ride.c | 6 +++--- src/scenario.c | 1 - src/string_ids.h | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ride.c b/src/ride.c index a709606d4d..840d12abf9 100644 --- a/src/ride.c +++ b/src/ride.c @@ -240,7 +240,7 @@ void ride_entrance_exit_connected(rct_ride* ride, int ride_idx) // name of ride is parameter of the format string RCT2_GLOBAL(0x013CE952, uint16) = ride->var_04A; RCT2_GLOBAL(0x013CE954, uint32) = ride->var_04C; - news_item_add_to_queue(1, 0xb26, ride_idx); + news_item_add_to_queue(1, STR_ENTRANCE_NOT_CONNECTED, ride_idx); ride->connected_message_throttle = 3; } @@ -248,7 +248,7 @@ void ride_entrance_exit_connected(rct_ride* ride, int ride_idx) // name of ride is parameter of the format string RCT2_GLOBAL(0x013CE952, uint16) = ride->var_04A; RCT2_GLOBAL(0x013CE954, uint32) = ride->var_04C; - news_item_add_to_queue(1, 0xb27, ride_idx); + news_item_add_to_queue(1, STR_EXIT_NOT_CONNECTED, ride_idx); ride->connected_message_throttle = 3; } @@ -315,7 +315,7 @@ void ride_shop_connected(rct_ride* ride, int ride_idx) // name of ride is parameter of the format string RCT2_GLOBAL(0x013CE952, uint16) = ride->var_04A; RCT2_GLOBAL(0x013CE954, uint32) = ride->var_04C; - news_item_add_to_queue(1, 0xb26, ride_idx); + news_item_add_to_queue(1, STR_ENTRANCE_NOT_CONNECTED, ride_idx); ride->connected_message_throttle = 3; } diff --git a/src/scenario.c b/src/scenario.c index cda9235f13..6dc29fa1bf 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -574,7 +574,6 @@ void scenario_update() RCT2_CALLPROC_EBPSAFE(0x0069E79A); // daily profit update RCT2_CALLPROC_EBPSAFE(0x0069C35E); // some kind of peeps days_visited update loop get_local_time(); - ride_check_all_reachable(); // XXX remove after debugging done RCT2_CALLPROC_EBPSAFE(0x0066A13C); // objective 6 dragging if (objective_type == 10 || objective_type == 9 || objective_type == 8 || objective_type == 6 || objective_type == 5) { diff --git a/src/string_ids.h b/src/string_ids.h index 6812f33eeb..5db27533b3 100644 --- a/src/string_ids.h +++ b/src/string_ids.h @@ -567,6 +567,9 @@ enum { STR_NO_RECENT_AWARDS = 2848, + STR_ENTRANCE_NOT_CONNECTED = 2854, + STR_EXIT_NOT_CONNECTED = 2855, + STR_TUTORIAL = 2856, STR_PRESS_KEY_OR_MOUSE_BUTTON_FOR_CONTROL = 2857,