mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 18:31:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add U with ring

Browse source
This commit is contained in:
Gymnasiast 2019-03-25 16:51:27 +01:00
parent 92d348fe43
commit cf65d01ac0
9 changed files with 81 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/g2/font/latin/u-ring-bold.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 180 B

BIN
resources/g2/font/latin/u-ring-small.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 174 B

BIN
resources/g2/font/latin/u-ring-tiny.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 172 B

BIN
resources/g2/font/latin/u-ring-uc-bold.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 194 B

BIN
resources/g2/font/latin/u-ring-uc-small.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 184 B

BIN
resources/g2/font/latin/u-ring-uc-tiny.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 171 B

72
resources/g2/sprites.json
View file

@ -832,6 +832,30 @@
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/t-caron-uc-small.png",
"y_offset": -1,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/t-caron-small.png",
"y_offset": 1,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/u-ring-uc-small.png",
"y_offset": -1,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/u-ring-small.png",
"y_offset": 0,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/rouble-small.png",
"y_offset": 0,
@ -1277,6 +1301,30 @@
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/t-caron-uc-bold.png",
"y_offset": -1,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/t-caron-bold.png",
"y_offset": 0,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/u-ring-uc-bold.png",
"y_offset": -1,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/u-ring-bold.png",
"y_offset": -1,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/rouble-bold.png",
"y_offset": 0,
@ -1730,6 +1778,30 @@
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/t-caron-uc-tiny.png",
"y_offset": -1,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/t-caron-tiny.png",
"y_offset": 0,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/u-ring-uc-tiny.png",
"y_offset": -1,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/latin/u-ring-tiny.png",
"y_offset": -1,
"palette": "keep",
"forceBmp": true
},
{
"path": "font/rouble-tiny.png",
"y_offset": 0,

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

@ -69,6 +69,10 @@ static const std::map<char32_t, int32_t> codepointOffsetMap = {
{ UnicodeChar::s_cedilla, SPR_G2_S_CEDILLA_LOWER - SPR_CHAR_START },
{ UnicodeChar::s_caron_uc, SPR_G2_S_CARON_UPPER - SPR_CHAR_START },
{ UnicodeChar::s_caron, SPR_G2_S_CARON_LOWER - SPR_CHAR_START },
{ UnicodeChar::t_caron_uc, SPR_G2_T_CARON_UPPER - SPR_CHAR_START },
{ UnicodeChar::t_caron, SPR_G2_T_CARON_LOWER - SPR_CHAR_START },
{ UnicodeChar::u_ring_uc, SPR_G2_U_RING_UPPER - SPR_CHAR_START },
{ UnicodeChar::u_ring, SPR_G2_U_RING_LOWER - SPR_CHAR_START },
{ UnicodeChar::u_double_acute_uc, SPR_G2_U_DOUBLE_ACUTE_UPPER - SPR_CHAR_START },
{ UnicodeChar::u_double_acute, SPR_G2_U_DOUBLE_ACUTE_LOWER - SPR_CHAR_START },
{ UnicodeChar::z_acute_uc, CSChar::z_acute_uc - CS_SPRITE_FONT_OFFSET },

6
src/openrct2/sprites.h
View file

@ -923,8 +923,12 @@ enum
SPR_G2_R_CARON_LOWER = SPR_G2_CHAR_BEGIN + 77,
SPR_G2_S_CARON_UPPER = SPR_G2_CHAR_BEGIN + 78,
SPR_G2_S_CARON_LOWER = SPR_G2_CHAR_BEGIN + 79,
SPR_G2_T_CARON_UPPER = SPR_G2_CHAR_BEGIN + 80,
SPR_G2_T_CARON_LOWER = SPR_G2_CHAR_BEGIN + 81,
SPR_G2_U_RING_UPPER = SPR_G2_CHAR_BEGIN + 82,
SPR_G2_U_RING_LOWER = SPR_G2_CHAR_BEGIN + 83,
SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 80,
SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 84,
SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN,
SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1,