mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #9715: large scenery banners have incorrect colour and scrolling (#9716)

This commit is contained in:
Ted John 2019-08-02 20:18:42 +01:00 committed by Michael Steenbeek
parent fcc41b4647
commit b7121553b4
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/drawing/ScrollingText.cpp
View File

@ -1572,7 +1572,11 @@ static void scrolling_text_set_bitmap_for_ttf(
{
if (codepoint >= FORMAT_COLOUR_CODE_START && codepoint <= FORMAT_COLOUR_CODE_END)
{
colour = (uint8_t)codepoint;
auto g1 = gfx_get_g1_element(SPR_TEXT_PALETTE);
if (g1 != nullptr)
{
colour = g1->offset[codepoint * 4];
}
}
}
else

20
src/openrct2/paint/tile_element/Paint.LargeScenery.cpp
View File

@ -411,31 +411,31 @@ void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t hei
return;
}
// Draw scrolling text:
set_format_arg(0, uint32_t, 0);
set_format_arg(4, uint32_t, 0);
uint8_t textColour = tileElement->AsLargeScenery()->GetSecondaryColour();
if (dword_F4387C)
{
textColour = COLOUR_GREY;
}
if (direction == 3)
if (direction == 0)
{
textColour |= (1 << 7);
textColour = ColourMapA[textColour].mid_dark;
}
else
{
textColour = ColourMapA[textColour].light;
}
// 6B809A:
set_format_arg(7, uint8_t, textColour);
uint16_t scrollMode = entry->large_scenery.scrolling_mode + ((direction + 1) & 0x3);
auto banner = tileElement->AsLargeScenery()->GetBanner();
banner->FormatTextTo(gCommonFormatArgs);
utf8 signString[256];
rct_string_id stringId = STR_SCROLLING_SIGN_TEXT;
if (gConfigGeneral.upper_case_banners)
{
format_string_to_upper(signString, sizeof(signString), STR_STRINGID, gCommonFormatArgs);
format_string_to_upper(signString, sizeof(signString), STR_SCROLLING_SIGN_TEXT, gCommonFormatArgs);
}
else
{
format_string(signString, sizeof(signString), STR_STRINGID, gCommonFormatArgs);
format_string(signString, sizeof(signString), STR_SCROLLING_SIGN_TEXT, gCommonFormatArgs);
}
gCurrentFontSpriteBase = FONT_SPRITE_BASE_TINY;
@ -443,8 +443,8 @@ void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t hei
uint16_t string_width = gfx_get_string_width(signString);
uint16_t scroll = (gCurrentTicks / 2) % string_width;
sub_98199C(
session, scrolling_text_setup(session, stringId, scroll, scrollMode, banner->colour), 0, 0, 1, 1, 21, height + 25,
boxoffset.x, boxoffset.y, boxoffset.z);
session, scrolling_text_setup(session, STR_SCROLLING_SIGN_TEXT, scroll, scrollMode, textColour), 0, 0, 1, 1, 21,
height + 25, boxoffset.x, boxoffset.y, boxoffset.z);
large_scenery_paint_supports(session, direction, height, tileElement, dword_F4387C, tile);
}