mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14:31 +01:00
Code Issues Releases Wiki Activity

Add D and E with caron

Browse Source 
This also adds the Unicode codepoints for the remaining Czech letters.
This commit is contained in:
Michael Steenbeek
2018-09-23 22:23:37 +02:00
committed by GitHub
parent 16936d4ea1
commit fd12aff8f7
16 changed files with 98 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,8 +43,12 @@ static const std::map<char32_t, int32_t> codepointOffsetMap = {
{ UnicodeChar::c_acute, CSChar::c_acute - CS_SPRITE_FONT_OFFSET },
{ UnicodeChar::c_caron_uc, SPR_G2_C_CARON_UPPER - SPR_CHAR_START },
{ UnicodeChar::c_caron, SPR_G2_C_CARON_LOWER - SPR_CHAR_START },
{ UnicodeChar::d_caron_uc, SPR_G2_D_CARON_UPPER - SPR_CHAR_START },
{ UnicodeChar::d_caron, SPR_G2_D_CARON_LOWER - SPR_CHAR_START },
{ UnicodeChar::e_ogonek_uc, CSChar::e_ogonek_uc - CS_SPRITE_FONT_OFFSET },
{ UnicodeChar::e_ogonek, CSChar::e_ogonek - CS_SPRITE_FONT_OFFSET },
{ UnicodeChar::e_caron_uc, SPR_G2_E_CARON_UPPER - SPR_CHAR_START },
{ UnicodeChar::e_caron, SPR_G2_E_CARON_LOWER - SPR_CHAR_START },
{ UnicodeChar::g_breve_uc, SPR_G2_G_BREVE_UPPER - SPR_CHAR_START },
{ UnicodeChar::g_breve, SPR_G2_G_BREVE_LOWER - SPR_CHAR_START },
{ UnicodeChar::i_with_dot_uc, SPR_G2_I_WITH_DOT_UPPER - SPR_CHAR_START },

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

@@ -158,8 +158,12 @@ namespace UnicodeChar
constexpr char32_t c_acute = 0x107;
constexpr char32_t c_caron_uc = 0x10C;
constexpr char32_t c_caron = 0x10D;
constexpr char32_t d_caron_uc = 0x10E;
constexpr char32_t d_caron = 0x10F;
constexpr char32_t e_ogonek_uc = 0x118;
constexpr char32_t e_ogonek = 0x119;
constexpr char32_t e_caron_uc = 0x11A;
constexpr char32_t e_caron = 0x11B;
constexpr char32_t g_breve_uc = 0x11E;
constexpr char32_t g_breve = 0x11F;
constexpr char32_t i_with_dot_uc = 0x130;
@@ -168,18 +172,30 @@ namespace UnicodeChar
constexpr char32_t l_stroke = 0x142;
constexpr char32_t n_acute_uc = 0x143;
constexpr char32_t n_acute = 0x144;
constexpr char32_t n_caron_uc = 0x147;
constexpr char32_t n_caron = 0x148;
constexpr char32_t o_double_acute_uc = 0x150;
constexpr char32_t o_double_acute = 0x151;
constexpr char32_t r_caron_uc = 0x158;
constexpr char32_t r_caron = 0x159;
constexpr char32_t s_acute_uc = 0x15A;
constexpr char32_t s_acute = 0x15B;
constexpr char32_t s_cedilla_uc = 0x15E;
constexpr char32_t s_cedilla = 0x15F;
constexpr char32_t s_caron_uc = 0x160;
constexpr char32_t s_caron = 0x161;
constexpr char32_t t_caron_uc = 0x164;
constexpr char32_t t_caron = 0x165;
constexpr char32_t u_ring_uc = 0x16E;
constexpr char32_t u_ring = 0x16F;
constexpr char32_t u_double_acute_uc = 0x170;
constexpr char32_t u_double_acute = 0x171;
constexpr char32_t z_acute_uc = 0x179;
constexpr char32_t z_acute = 0x17A;
constexpr char32_t z_dot_uc = 0x17B;
constexpr char32_t z_dot = 0x17C;
constexpr char32_t z_caron_uc = 0x17D;
constexpr char32_t z_caron = 0x17E;
constexpr char32_t f_with_hook_uc = 0x191;
constexpr char32_t s_comma_uc = 0x218;
constexpr char32_t s_comma = 0x219;

7
src/openrct2/sprites.h
View File

@@ -924,7 +924,12 @@ enum
SPR_G2_U_DOUBLE_ACUTE_UPPER = SPR_G2_CHAR_BEGIN + 68,
SPR_G2_U_DOUBLE_ACUTE_LOWER = SPR_G2_CHAR_BEGIN + 69,
SPR_G2_CHAR_END = SPR_G2_U_DOUBLE_ACUTE_LOWER,
SPR_G2_D_CARON_UPPER = SPR_G2_CHAR_BEGIN + 70,
SPR_G2_D_CARON_LOWER = SPR_G2_CHAR_BEGIN + 71,
SPR_G2_E_CARON_UPPER = SPR_G2_CHAR_BEGIN + 72,
SPR_G2_E_CARON_LOWER = SPR_G2_CHAR_BEGIN + 73,
SPR_G2_CHAR_END = SPR_G2_E_CARON_LOWER,
SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1,
// 0x60000, chosen because it's a round hex number