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

Remove references to 0x009C383D

This commit is contained in:
Ted John 2016-09-10 23:48:29 +01:00
parent fe7800a508
commit 5db4f4f2ee
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/drawing/string.c
View File

@ -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);

8
src/interface/chat.c
View File

@ -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;