From 33929d3ac440ead484e9bc8f6b435bae808149aa Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Mon, 3 Aug 2015 14:29:05 +0100 Subject: [PATCH] implement utf8, part 25 (bug fixes) --- src/localisation/language.c | 2 +- src/openrct2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/localisation/language.c b/src/localisation/language.c index fd0deb5070..edb8538eda 100644 --- a/src/localisation/language.c +++ b/src/localisation/language.c @@ -375,7 +375,7 @@ static utf8 *convert_multibyte_charset(const char *src, int languageId) codepoint = convert_specific_language_character_to_unicode(languageId, codepoint); dst = utf8_write_codepoint(dst, codepoint); } else { - *dst++ = *ch++; + dst = utf8_write_codepoint(dst, *ch++); } } *dst++ = 0; diff --git a/src/openrct2.c b/src/openrct2.c index c6f10dbabe..da1f3cad48 100644 --- a/src/openrct2.c +++ b/src/openrct2.c @@ -194,7 +194,7 @@ bool openrct2_initialise() addhook(0x006BB76E, (int)sound_play_panned, 0, (int[]){EAX, EBX, ECX, EDX, EBP, END}, EAX, 0); // remove when all callers are decompiled addhook(0x006C42D9, (int)scrolling_text_setup, 0, (int[]){EAX, ECX, EBP, END}, 0, EBX); // remove when all callers are decompiled addhook(0x006C2321, (int)gfx_get_string_width, 0, (int[]){ESI, END}, 0, ECX); // remove when all callers are decompiled - addhook(0x006C2321, (int)format_string, 0, (int[]){EDI, EAX, ECX, END}, 0, 0); // remove when all callers are decompiled + addhook(0x006C2555, (int)format_string, 0, (int[]){EDI, EAX, ECX, END}, 0, 0); // remove when all callers are decompiled if (!rct2_init()) return false;