From bcb6b83a7d47b58f2e60afcfdf61c37b406d1732 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Wed, 18 Oct 2017 18:27:34 +0200 Subject: [PATCH] Fix #6514: Groupbox titles break format arguments --- src/openrct2/interface/widget.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/openrct2/interface/widget.c b/src/openrct2/interface/widget.c index 82d9b9593f..e8eefe0dae 100644 --- a/src/openrct2/interface/widget.c +++ b/src/openrct2/interface/widget.c @@ -538,10 +538,12 @@ static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widg if (widget_is_disabled(w, widgetIndex)) colour |= 0x40; - 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; + utf8 buffer[512] = { 0 }; + uint8 args[sizeof(uintptr_t)] = { 0 }; + format_string(buffer, sizeof(buffer), widget->text, gCommonFormatArgs); + set_format_arg_on(args, 0, uintptr_t, buffer); + gfx_draw_string_left(dpi, STR_STRING, args, colour, l, t); + textRight = l + gfx_get_string_width(buffer) + 1; } // Border