mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

Fix unicode values of some characters

Browse Source
This commit is contained in:
Gymnasiast
2018-01-21 16:26:19 +01:00
committed by Michael Steenbeek
parent 6bf09e7abb
commit 498ca56f57
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/drawing/Font.cpp
View File

@@ -66,7 +66,7 @@ sint32 font_sprite_get_codepoint_offset(sint32 codepoint)
case FORMAT_ENDQUOTES: return 34 - 32;
case FORMAT_UP: return 160 - 32;
case FORMAT_SYMBOL_i: return 160 - 32;
case FORMAT_INVERTEDEXCLAMATION: return 160 - 32;
case FORMAT_POUND: return 163 - 32;
case FORMAT_YEN: return 165 - 32;
@@ -187,7 +187,7 @@ bool font_supports_string_sprite(const utf8 *text)
switch (codepoint) {
case FORMAT_ENDQUOTES:
case FORMAT_UP:
case FORMAT_SYMBOL_i:
case FORMAT_INVERTEDEXCLAMATION:
case FORMAT_POUND:
case FORMAT_YEN:
case FORMAT_COPYRIGHT:

2
src/openrct2/localisation/ConversionTables.cpp
View File

@@ -181,7 +181,7 @@ const encoding_convert_entry RCT2ToUnicodeTable[256] =
{ 158, 158 },
{ RCT2_A_OGONEK_UC, UNICODE_A_OGONEK_UC },
{ 160, FORMAT_UP },
{ 161, FORMAT_SYMBOL_i },
{ 161, FORMAT_INVERTEDEXCLAMATION },
{ RCT2_C_ACUTE_UC, UNICODE_C_ACUTE_UC },
{ 163, FORMAT_POUND },
{ 164, 164 },

2
src/openrct2/localisation/ConversionTables.h
View File

@@ -21,7 +21,7 @@
typedef struct encoding_convert_entry
{
uint16 code;
uint16 unicode;
uint32 unicode;
}
encoding_convert_entry;

2
src/openrct2/localisation/Convert.cpp
View File

@@ -78,7 +78,7 @@ static wchar_t encoding_convert_x_to_unicode(wchar_t code, const encoding_conver
else return entry->unicode;
}
wchar_t encoding_convert_unicode_to_rct2(wchar_t unicode)
char32_t encoding_convert_unicode_to_rct2(char32_t unicode)
{
// Can't do a binary search as it's sorted by RCT2 code, not unicode
for (uint32 i = 0; i < Util::CountOf(RCT2ToUnicodeTable); i++) {

9
src/openrct2/localisation/FormatCodes.h
View File

@@ -107,6 +107,7 @@ enum {
FORMAT_COLOUR_CODE_END = FORMAT_PALESILVER,
// Extra non-ASCII characters
FORMAT_INVERTEDEXCLAMATION = 161,
FORMAT_POUND = 163,
FORMAT_YEN = 165,
FORMAT_COPYRIGHT = 169,
@@ -136,11 +137,11 @@ enum {
FORMAT_TICK = 10003,
FORMAT_CROSS = 10005,
FORMAT_SYMBOL_RAILWAY = 128740,
FORMAT_SYMBOL_ROAD = 128739,
FORMAT_SYMBOL_FLAG = 128681,
// Format codes that need suitable Unicode allocations
FORMAT_SYMBOL_i = 20000,
FORMAT_SYMBOL_RAILWAY = 20001,
FORMAT_SYMBOL_ROAD = 20002,
FORMAT_SYMBOL_FLAG = 20003,
FORMAT_COMMA1DP16 = 20004
};

3
src/openrct2/localisation/Localisation.h
View File

@@ -17,6 +17,7 @@
#ifndef LOCALISATION_H
#define LOCALISATION_H
#include <uchar.h>
#include "Currency.h"
#include "Date.h"
#include "FormatCodes.h"
@@ -58,7 +59,7 @@ sint32 win1252_to_utf8(utf8string dst, const char *src, size_t srcLength, size_t
sint32 rct2_to_utf8(utf8 *dst, const char *src);
sint32 utf8_to_rct2(char *dst, const utf8 *src);
wchar_t encoding_convert_rct2_to_unicode(wchar_t rct2str);
wchar_t encoding_convert_unicode_to_rct2(wchar_t unicode);
char32_t encoding_convert_unicode_to_rct2(char32_t unicode);
wchar_t encoding_convert_gb2312_to_unicode(wchar_t gb2312);
wchar_t encoding_convert_big5_to_unicode(wchar_t big5);
wchar_t encoding_convert_cp932_to_unicode(wchar_t cp932);