From 5ee7d1bbaea7e36dea182120a3db7e3ee5d11dcc Mon Sep 17 00:00:00 2001 From: Alexander Overvoorde Date: Wed, 10 Feb 2016 22:28:45 +0100 Subject: [PATCH] Show amount of peeps still on ride in tooltip when ride is closed (resolves #2708) --- data/language/english_uk.txt | 2 ++ src/localisation/string_ids.h | 3 +++ src/ride/ride.c | 11 +++++++++++ 3 files changed, 16 insertions(+) diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 1785482a2b..7cbd3cf2d5 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -4041,6 +4041,8 @@ STR_5733 :Use NN scaling at integer scales STR_5734 :{SMALLFONT}{BLACK}Rendering STR_5735 :Network Status STR_5736 :Player +STR_5737 :Closed, {COMMA16} person still on ride +STR_5738 :Closed, {COMMA16} people still on ride ############# # Scenarios # diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index 893142ad15..034c8ff0ad 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -2333,6 +2333,9 @@ enum { STR_OPTIONS_RENDERING_TIP = 5734, + STR_CLOSED_WITH_PERSON = 5737, + STR_CLOSED_WITH_PEOPLE = 5738, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 }; diff --git a/src/ride/ride.c b/src/ride/ride.c index 439e45b275..a0d56972ed 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -710,6 +710,17 @@ void ride_get_status(int rideIndex, int *formatSecondary, int *argument) } if (ride->status == RIDE_STATUS_CLOSED) { *formatSecondary = STR_CLOSED; + + if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_IS_SHOP)) { + *argument = ride->num_riders; + + if (*argument == 1) { + *formatSecondary = STR_CLOSED_WITH_PERSON; + } else if (*argument > 1) { + *formatSecondary = STR_CLOSED_WITH_PEOPLE; + } + } + return; } if (ride->status == RIDE_STATUS_TESTING) {