From 46959b20b4eb76a2a9bbdfa8c0267604c000f43c Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Wed, 27 Jul 2016 00:32:23 +0200 Subject: [PATCH] Split up ride mode values --- src/localisation/string_ids.h | 4 ++-- src/windows/ride.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index 2ca1dfddd4..aa215e076c 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -1171,7 +1171,7 @@ enum { STR_RIDE_CONSTRUCTION_MODE = 1733, STR_NUMBER_OF_LAPS = 1734, STR_NUMBER_OF_LAPS_TIP = 1735, - STR_RIDE_MODE_COUNT_VALUE = 1736, + STR_NUMBER_OF_LAPS_VALUE = 1736, // STR_1737 :{COMMA16} STR_CANT_CHANGE_NUMBER_OF_LAPS = 1738, STR_RACE_WON_BY_GUEST = 1739, @@ -1179,7 +1179,7 @@ enum { STR_NOT_YET_CONSTRUCTED = 1741, STR_MAX_PEOPLE_ON_RIDE = 1742, STR_MAX_PEOPLE_ON_RIDE_TIP = 1743, -// STR_1744 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16} + STR_MAX_PEOPLE_ON_RIDE_VALUE = 1744, // STR_1745 :{COMMA16} STR_CANT_CHANGE_THIS = 1746, STR_TIME_LIMIT = 1747, diff --git a/src/windows/ride.c b/src/windows/ride.c index 508f1f38bb..a1b64a38bf 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -3586,7 +3586,7 @@ static void window_ride_operating_invalidate(rct_window *w) break; case RIDE_MODE_RACE: set_format_arg(18, uint16, ride->num_laps); - format = STR_RIDE_MODE_COUNT_VALUE; + format = STR_NUMBER_OF_LAPS_VALUE; caption = STR_NUMBER_OF_LAPS; tooltip = STR_NUMBER_OF_LAPS_TIP; break; @@ -3608,8 +3608,7 @@ static void window_ride_operating_invalidate(rct_window *w) tooltip = STR_NUMBER_OF_ROTATIONS_TIP; break; default: - // TODO: should likely be `1744` instead of `1736`, - format = STR_RIDE_MODE_COUNT_VALUE; + format = STR_MAX_PEOPLE_ON_RIDE_VALUE; caption = STR_MAX_PEOPLE_ON_RIDE; tooltip = STR_MAX_PEOPLE_ON_RIDE_TIP; if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_13))