diff --git a/src/drawing/string.c b/src/drawing/string.c index 34fa4690fc..18d8af1081 100644 --- a/src/drawing/string.c +++ b/src/drawing/string.c @@ -340,15 +340,13 @@ void gfx_draw_string_centred(rct_drawpixelinfo *dpi, rct_string_id format, int x int gfx_draw_string_centred_wrapped(rct_drawpixelinfo *dpi, void *args, int x, int y, int width, rct_string_id format, int colour) { int font_height, line_height, line_y, num_lines; - char* buffer = RCT2_ADDRESS(0x009C383D, char); if (gCurrentFontSpriteBase >= 0) { gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; } - gfx_draw_string(dpi, buffer, colour, dpi->x, dpi->y); - - buffer = gCommonStringFormatBuffer; + char *buffer = gCommonStringFormatBuffer; + gfx_draw_string(dpi, "", colour, dpi->x, dpi->y); format_string(buffer, format, args); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -394,9 +392,8 @@ int gfx_draw_string_left_wrapped(rct_drawpixelinfo *dpi, void *args, int x, int gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; - char* buffer = RCT2_ADDRESS(0x009C383D, char); - gfx_draw_string(dpi, buffer, colour, dpi->x, dpi->y); - buffer = gCommonStringFormatBuffer; + char *buffer = gCommonStringFormatBuffer; + gfx_draw_string(dpi, "", colour, dpi->x, dpi->y); format_string(buffer, format, args); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -555,7 +552,7 @@ void draw_string_centred_underline(rct_drawpixelinfo *dpi, rct_string_id format, void draw_string_centred_raw(rct_drawpixelinfo *dpi, int x, int y, int numLines, char *text) { gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; - gfx_draw_string(dpi, RCT2_ADDRESS(0x009C383D, char), 0, dpi->x, dpi->y); + gfx_draw_string(dpi, "", 0, dpi->x, dpi->y); gCurrentFontFlags = 0; for (int i = 0; i <= numLines; i++) { @@ -657,7 +654,7 @@ void gfx_draw_string_centred_wrapped_partial(rct_drawpixelinfo *dpi, int x, int utf8 *buffer = gCommonStringFormatBuffer; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; - gfx_draw_string(dpi, RCT2_ADDRESS(0x009C383D, char), colour, dpi->x, dpi->y); + gfx_draw_string(dpi, "", colour, dpi->x, dpi->y); format_string(buffer, format, args); diff --git a/src/interface/chat.c b/src/interface/chat.c index 2fc084d43b..def0d729be 100644 --- a/src/interface/chat.c +++ b/src/interface/chat.c @@ -218,9 +218,8 @@ int chat_history_draw_string(rct_drawpixelinfo *dpi, void *args, int x, int y, i gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; - char* buffer = RCT2_ADDRESS(0x009C383D, char); - gfx_draw_string(dpi, buffer, 255, dpi->x, dpi->y); - buffer = gCommonStringFormatBuffer; + gfx_draw_string(dpi, "", 255, dpi->x, dpi->y); + char *buffer = gCommonStringFormatBuffer; format_string(buffer, STR_STRING, args); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -251,8 +250,7 @@ int chat_string_wrapped_get_height(void *args, int width) gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; - char* buffer = RCT2_ADDRESS(0x009C383D, char); - buffer = gCommonStringFormatBuffer; + char *buffer = gCommonStringFormatBuffer; format_string(buffer, STR_STRING, args); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;