diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index b8956b8499..8c98771fc7 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -868,8 +868,16 @@ enum { STR_CONTINUE_SAVED_GAME_TIP = 1922, STR_SHOW_TUTORIAL_TIP = 1923, STR_EXIT = 1924, - STR_RIDE_HAS_CRASHED = 1928, + STR_RIDE_IS_BROKEN_DOWN = 1927, + STR_RIDE_HAS_CRASHED = 1928, + STR_RIDE_IS_STILL_NOT_FIXED = 1929, + + STR_PEEP_TRACKING_PEEP_JOINED_QUEUE_FOR_X = 1931, + STR_PEEP_TRACKING_PEEP_IS_ON_X = 1932, + STR_PEEP_TRACKING_PEEP_IS_IN_X = 1933, + STR_PEEP_TRACKING_LEFT_RIDE_X = 1934, + STR_PEEP_TRACKING_LEFT_PARK = 1935, STR_PEEP_TRACKING_NOTIFICATION_BOUGHT_X = 1936, STR_SHOW_SUBJECT_TIP = 1937, @@ -1134,6 +1142,9 @@ enum { STR_CANT_DEMOLISH_RIDE = 2248, + STR_NEWS_ITEM_RESEARCH_NEW_RIDE_AVAILABLE = 2249, + STR_NEWS_ITEM_RESEARCH_NEW_SCENERY_SET_AVAILABLE = 2250, + STR_CAN_ONLY_BE_BUILT_ACROSS_PATHS = 2252, STR_RESEARCH_TRANSPORT_RIDES = 2253, @@ -1222,6 +1233,8 @@ enum { STR_METRIC = 2345, STR_DISPLAY = 2346, + STR_NEWS_ITEM_GUEST_DROWNED = 2347, + STR_STAFF_STATS_TIP = 2348, //STR_UNITS = 2358, diff --git a/src/management/research.c b/src/management/research.c index 9cd6f3c3b8..d5f254da88 100644 --- a/src/management/research.c +++ b/src/management/research.c @@ -22,6 +22,7 @@ #include "../game.h" #include "../interface/window.h" #include "../localisation/date.h" +#include "../localisation/string_ids.h" #include "../management/finance.h" #include "../scenario.h" #include "../rct1.h" @@ -203,7 +204,7 @@ void research_finish_item(sint32 entryIndex) RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS, rct_string_id) = ((rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME)) ? rideEntry->name : base_ride_type + 2; if (!gSilentResearch) - news_item_add_to_queue(NEWS_ITEM_RESEARCH, 2249, entryIndex); + news_item_add_to_queue(NEWS_ITEM_RESEARCH, STR_NEWS_ITEM_RESEARCH_NEW_RIDE_AVAILABLE, entryIndex); } research_invalidate_related_windows(); @@ -219,7 +220,7 @@ void research_finish_item(sint32 entryIndex) if (RCT2_GLOBAL(0x009AC06C, uint8) == 0) { RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS, rct_string_id) = scenerySetEntry->name; if (!gSilentResearch) - news_item_add_to_queue(NEWS_ITEM_RESEARCH, 2250, entryIndex); + news_item_add_to_queue(NEWS_ITEM_RESEARCH, STR_NEWS_ITEM_RESEARCH_NEW_SCENERY_SET_AVAILABLE, entryIndex); } research_invalidate_related_windows(); diff --git a/src/peep/peep.c b/src/peep/peep.c index be8d7f5ec0..c042195323 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -1329,7 +1329,7 @@ void peep_update_falling(rct_peep* peep){ if (!(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & 0x80000)){ RCT2_GLOBAL(0x13CE952, uint16) = peep->name_string_idx; RCT2_GLOBAL(0x13CE954, uint32) = peep->id; - news_item_add_to_queue(NEWS_ITEM_BLANK, 2347, peep->x | (peep->y << 16)); + news_item_add_to_queue(NEWS_ITEM_BLANK, STR_NEWS_ITEM_GUEST_DROWNED, peep->x | (peep->y << 16)); } RCT2_GLOBAL(0x135882E, uint16) += 25; if (RCT2_GLOBAL(0x135882E, uint16) > 1000){ @@ -2119,9 +2119,9 @@ static void peep_update_ride_sub_state_2_enter_ride(rct_peep* peep, rct_ride* ri rct_string_id msg_string; if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_FLAGS, uint32)[ride->type * 2] & RIDE_TYPE_FLAG_IN_RIDE) - msg_string = 1932; + msg_string = STR_PEEP_TRACKING_PEEP_IS_IN_X; else - msg_string = 1933; + msg_string = STR_PEEP_TRACKING_PEEP_IS_ON_X; news_item_add_to_queue(NEWS_ITEM_PEEP_ON_RIDE, msg_string, peep->sprite_index); } @@ -3169,7 +3169,7 @@ static void peep_update_ride_sub_state_18(rct_peep* peep){ RCT2_GLOBAL(0x13CE958, uint16) = ride->name; RCT2_GLOBAL(0x13CE95A, uint32) = ride->name_arguments; - news_item_add_to_queue(NEWS_ITEM_PEEP_ON_RIDE, 1934, peep->sprite_index); + news_item_add_to_queue(NEWS_ITEM_PEEP_ON_RIDE, STR_PEEP_TRACKING_LEFT_RIDE_X, peep->sprite_index); } peep->var_79 = 0xFF; @@ -6297,7 +6297,7 @@ static int peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rct_m RCT2_GLOBAL(0x0013CE954, uint32) = peep->id; RCT2_GLOBAL(0x0013CE958, rct_string_id) = ride->name; RCT2_GLOBAL(0x0013CE95A, uint32) = ride->name_arguments; - news_item_add_to_queue(NEWS_ITEM_PEEP_ON_RIDE, 1931, peep->sprite_index); + news_item_add_to_queue(NEWS_ITEM_PEEP_ON_RIDE, STR_PEEP_TRACKING_PEEP_JOINED_QUEUE_FOR_X, peep->sprite_index); } return 1; } @@ -6339,7 +6339,7 @@ static int peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rct_m if (peep->flags & PEEP_FLAGS_TRACKING){ RCT2_GLOBAL(0x0013CE952, rct_string_id) = peep->name_string_idx; RCT2_GLOBAL(0x0013CE954, uint32) = peep->id; - news_item_add_to_queue(NEWS_ITEM_PEEP_ON_RIDE, 1935, peep->sprite_index); + news_item_add_to_queue(NEWS_ITEM_PEEP_ON_RIDE, STR_PEEP_TRACKING_LEFT_PARK, peep->sprite_index); } return 1; } @@ -6674,7 +6674,7 @@ static int peep_interact_with_path(rct_peep* peep, sint16 x, sint16 y, rct_map_e RCT2_GLOBAL(0x0013CE954, uint32) = peep->id; RCT2_GLOBAL(0x0013CE958, rct_string_id) = ride->name; RCT2_GLOBAL(0x0013CE95A, uint32) = ride->name_arguments; - news_item_add_to_queue(NEWS_ITEM_PEEP_ON_RIDE, 1931, peep->sprite_index); + news_item_add_to_queue(NEWS_ITEM_PEEP_ON_RIDE, STR_PEEP_TRACKING_PEEP_JOINED_QUEUE_FOR_X, peep->sprite_index); } return peep_footpath_move_forward(peep, x, y, map_element, vandalism_present); diff --git a/src/ride/ride.c b/src/ride/ride.c index 1e95c33489..fb154e3852 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -2299,7 +2299,7 @@ void ride_breakdown_add_news_item(int rideIndex) RCT2_GLOBAL(0x0013CE952 + 0, uint16) = ride->name; RCT2_GLOBAL(0x0013CE952 + 2, uint32) = ride->name_arguments; - news_item_add_to_queue(NEWS_ITEM_RIDE, 1927, rideIndex); + news_item_add_to_queue(NEWS_ITEM_RIDE, STR_RIDE_IS_BROKEN_DOWN, rideIndex); } /** @@ -2323,7 +2323,7 @@ static void ride_breakdown_status_update(int rideIndex) ) { RCT2_GLOBAL(0x0013CE952 + 0, uint16) = ride->name; RCT2_GLOBAL(0x0013CE952 + 2, uint32) = ride->name_arguments; - news_item_add_to_queue(NEWS_ITEM_RIDE, 1929, rideIndex); + news_item_add_to_queue(NEWS_ITEM_RIDE, STR_RIDE_IS_STILL_NOT_FIXED, rideIndex); } }