mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

Protect ride rating names from extreme numbers

Browse Source
This commit is contained in:
Ted John
2017-01-09 18:47:25 +00:00
parent f14738836a
commit 463fadbcf6
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/windows/ride.c
View File

@@ -4890,6 +4890,12 @@ static void window_ride_music_paint(rct_window *w, rct_drawpixelinfo *dpi)
#pragma region Measurements
static rct_string_id get_rating_name(ride_rating rating)
{
sint32 index = clamp(0, rating >> 8, countof(RatingNames) - 1);
return RatingNames[index];
}
/**
*
* rct2: 0x006D2804
@@ -5220,15 +5226,17 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
if (ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED) {
// Excitement
rct_string_id ratingName = get_rating_name(ride->excitement);
set_format_arg(0, uint32, ride->excitement);
set_format_arg(4, rct_string_id, RatingNames[min(ride->excitement >> 8, 5)]);
set_format_arg(4, rct_string_id, ratingName);
rct_string_id stringId = ride->excitement == RIDE_RATING_UNDEFINED ? STR_EXCITEMENT_RATING_NOT_YET_AVAILABLE : STR_EXCITEMENT_RATING;
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += 10;
// Intensity
ratingName = get_rating_name(ride->intensity);
set_format_arg(0, uint32, ride->intensity);
set_format_arg(4, rct_string_id, RatingNames[min(ride->intensity >> 8, 5)]);
set_format_arg(4, rct_string_id, ratingName);
stringId = STR_INTENSITY_RATING;
if (ride->excitement == RIDE_RATING_UNDEFINED)
@@ -5240,8 +5248,9 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
y += 10;
// Nausea
ratingName = get_rating_name(ride->nausea);
set_format_arg(0, uint32, ride->nausea);
set_format_arg(4, rct_string_id, RatingNames[min(ride->nausea >> 8, 5)]);
set_format_arg(4, rct_string_id, ratingName);
stringId = ride->excitement == RIDE_RATING_UNDEFINED ? STR_NAUSEA_RATING_NOT_YET_AVAILABLE : STR_NAUSEA_RATING;
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += 20;