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

Fix a couple of bugs

This commit is contained in:
Ted John 2017-09-03 23:13:55 +01:00 committed by Marijn van der Werf
parent 55c420b738
commit a8c9c758f4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/drawing/Text.cpp
View File

@ -207,6 +207,8 @@ extern "C"
utf8 buffer[256];
format_string(buffer, sizeof(buffer), format, args);
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
_legacyPaint.UnderlineText = false;
_legacyPaint.Colour = colour;
_legacyPaint.Alignment = TextAlignment::LEFT;
@ -223,10 +225,7 @@ extern "C"
utf8 buffer[256];
format_string(buffer, sizeof(buffer), format, args);
if (gCurrentFontSpriteBase >= 0)
{
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
}
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
_legacyPaint.UnderlineText = false;
_legacyPaint.Colour = colour;

5
src/openrct2/interface/widget.c
View File

@ -537,7 +537,10 @@ static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widg
uint8 colour = w->colours[widget->colour] & 0x7F;
if (widget_is_disabled(w, widgetIndex))
colour |= 0x40;
gfx_draw_string_left(dpi, widget->text, gCommonFormatArgs, colour, l, t);
format_string(gCommonStringFormatBuffer, sizeof(gCommonStringFormatBuffer), widget->text, gCommonFormatArgs);
set_format_arg(0, uintptr_t, gCommonStringFormatBuffer);
gfx_draw_string_left(dpi, STR_STRING, gCommonFormatArgs, colour, l, t);
textRight = l + gfx_get_string_width(gCommonStringFormatBuffer) + 1;
}