From a842e3a650672d809b7470bb042293000979f927 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Sun, 24 Jan 2016 17:06:05 -0700 Subject: [PATCH] Improved Rendering of Disabled Scenario Names --- src/drawing/string.c | 6 +++--- src/windows/title_scenarioselect.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/drawing/string.c b/src/drawing/string.c index b356523f7b..80330981f5 100644 --- a/src/drawing/string.c +++ b/src/drawing/string.c @@ -353,12 +353,12 @@ int gfx_draw_string_centred_wrapped(rct_drawpixelinfo *dpi, void *args, int x, i { int font_height, line_height, line_width, line_y, num_lines; // Location of font sprites - uint16* current_font_sprite_base; + sint16* current_font_sprite_base; char* buffer = RCT2_ADDRESS(0x009C383D, char); - current_font_sprite_base = RCT2_ADDRESS(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, uint16); - *current_font_sprite_base = 0xE0; + current_font_sprite_base = RCT2_ADDRESS(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, sint16); + if (*current_font_sprite_base >= 0) *current_font_sprite_base = 0xE0; gfx_draw_string(dpi, buffer, colour, dpi->x, dpi->y); diff --git a/src/windows/title_scenarioselect.c b/src/windows/title_scenarioselect.c index 9f90871694..4647473497 100644 --- a/src/windows/title_scenarioselect.c +++ b/src/windows/title_scenarioselect.c @@ -460,6 +460,7 @@ static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo * safe_strcpy((char*)language_get_string(placeholderStringId), scenario->name, 64); int format = isDisabled ? 865 : (isHighlighted ? highlighted_format : unhighlighted_format); colour = isDisabled ? w->colours[1] | 0x40 : COLOUR_BLACK; + if (isDisabled) RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, sint16) = -1; gfx_draw_string_centred(dpi, format, wide ? 270 : 210, y + 1, colour, &placeholderStringId); // Check if scenario is completed