duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Turns out raw unicode *is* UTF32

Browse source
This commit is contained in:
Clownacy 2020-09-17 19:43:12 +01:00
parent ada7d91f17
commit f61ffac785
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Font.cpp
View file

@ -856,7 +856,7 @@ static const unsigned short shiftjis_to_unicode_lookup[0x3100] = {
0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020
}; };
static unsigned short ShiftJISToUnicode(const unsigned char *string, size_t *bytes_read) static unsigned short ShiftJISToUTF32(const unsigned char *string, size_t *bytes_read)
{ {
size_t lookup_index; size_t lookup_index;
@ -889,7 +889,7 @@ static unsigned short ShiftJISToUnicode(const unsigned char *string, size_t *byt
#else #else
static unsigned long UTF8ToUnicode(const unsigned char *string, size_t *bytes_read) static unsigned long UTF8ToUTF32(const unsigned char *string, size_t *bytes_read)
{ {
size_t length; size_t length;
unsigned long charcode; unsigned long charcode;
@ -1302,9 +1302,9 @@ void DrawText(Font *font, RenderBackend_Surface *surface, int x, int y, unsigned
{ {
size_t bytes_read; size_t bytes_read;
#ifdef JAPANESE #ifdef JAPANESE
const unsigned short unicode_value = ShiftJISToUnicode(string_pointer, &bytes_read); const unsigned short unicode_value = ShiftJISToUTF32(string_pointer, &bytes_read);
#else #else
const unsigned long unicode_value = UTF8ToUnicode(string_pointer, &bytes_read); const unsigned long unicode_value = UTF8ToUTF32(string_pointer, &bytes_read);
#endif #endif
string_pointer += bytes_read; string_pointer += bytes_read;