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

Add R with caron

Browse Source
This commit is contained in:
Gymnasiast
2019-03-24 21:57:56 +01:00
parent 43d4a20b79
commit fd1f763b83
9 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/g2/font/latin/r-caron-bold.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 172 B

BIN
resources/g2/font/latin/r-caron-small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 B

BIN
resources/g2/font/latin/r-caron-tiny.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 B

BIN
resources/g2/font/latin/r-caron-uc-bold.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 184 B

BIN
resources/g2/font/latin/r-caron-uc-small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 182 B

BIN
resources/g2/font/latin/r-caron-uc-tiny.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 172 B

36
resources/g2/sprites.json
View File

@@ -808,6 +808,18 @@
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/r-caron-uc-small.png",
"y_offset": 0,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/r-caron-small.png",
"y_offset": 0,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/rouble-small.png",
"y_offset": 0,
@@ -1229,6 +1241,18 @@
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/r-caron-uc-bold.png",
"y_offset": -1,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/r-caron-bold.png",
"y_offset": 0,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/rouble-bold.png",
"y_offset": 0,
@@ -1658,6 +1682,18 @@
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/r-caron-uc-tiny.png",
"y_offset": -1,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/r-caron-tiny.png",
"y_offset": -1,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/rouble-tiny.png",
"y_offset": 0,

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

@@ -61,6 +61,8 @@ static const std::map<char32_t, int32_t> codepointOffsetMap = {
{ UnicodeChar::n_caron, SPR_G2_N_CARON_LOWER - SPR_CHAR_START },
{ UnicodeChar::o_double_acute_uc, SPR_G2_O_DOUBLE_ACUTE_UPPER - SPR_CHAR_START },
{ UnicodeChar::o_double_acute, SPR_G2_O_DOUBLE_ACUTE_LOWER - SPR_CHAR_START },
{ UnicodeChar::r_caron_uc, SPR_G2_R_CARON_UPPER - SPR_CHAR_START },
{ UnicodeChar::r_caron, SPR_G2_R_CARON_LOWER - SPR_CHAR_START },
{ UnicodeChar::s_acute_uc, CSChar::s_acute_uc - CS_SPRITE_FONT_OFFSET },
{ UnicodeChar::s_acute, CSChar::s_acute - CS_SPRITE_FONT_OFFSET },
{ UnicodeChar::s_cedilla_uc, SPR_G2_S_CEDILLA_UPPER - SPR_CHAR_START },

5
src/openrct2/sprites.h
View File

@@ -917,11 +917,12 @@ enum
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_N_CARON_UPPER = SPR_G2_CHAR_BEGIN + 74,
SPR_G2_N_CARON_LOWER = SPR_G2_CHAR_BEGIN + 75,
SPR_G2_R_CARON_UPPER = SPR_G2_CHAR_BEGIN + 76,
SPR_G2_R_CARON_LOWER = SPR_G2_CHAR_BEGIN + 77,
SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 76,
SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 78,
SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN,
SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1,