diff --git a/resources/g2/font/latin/s-caron-bold.png b/resources/g2/font/latin/s-caron-bold.png new file mode 100644 index 0000000000..14600a8dce Binary files /dev/null and b/resources/g2/font/latin/s-caron-bold.png differ diff --git a/resources/g2/font/latin/s-caron-small.png b/resources/g2/font/latin/s-caron-small.png new file mode 100644 index 0000000000..073d4d9c0f Binary files /dev/null and b/resources/g2/font/latin/s-caron-small.png differ diff --git a/resources/g2/font/latin/s-caron-tiny.png b/resources/g2/font/latin/s-caron-tiny.png new file mode 100644 index 0000000000..b6b358aeac Binary files /dev/null and b/resources/g2/font/latin/s-caron-tiny.png differ diff --git a/resources/g2/font/latin/s-caron-uc-bold.png b/resources/g2/font/latin/s-caron-uc-bold.png new file mode 100644 index 0000000000..e46b2b1bb2 Binary files /dev/null and b/resources/g2/font/latin/s-caron-uc-bold.png differ diff --git a/resources/g2/font/latin/s-caron-uc-small.png b/resources/g2/font/latin/s-caron-uc-small.png new file mode 100644 index 0000000000..aef1fb5e4d Binary files /dev/null and b/resources/g2/font/latin/s-caron-uc-small.png differ diff --git a/resources/g2/font/latin/s-caron-uc-tiny.png b/resources/g2/font/latin/s-caron-uc-tiny.png new file mode 100644 index 0000000000..51442f2b5e Binary files /dev/null and b/resources/g2/font/latin/s-caron-uc-tiny.png differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index bec93c5b82..f00aae5fac 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -820,6 +820,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/s-caron-uc-small.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/s-caron-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, { "path": "font/rouble-small.png", "y_offset": 0, @@ -1253,6 +1265,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/s-caron-uc-bold.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/s-caron-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, { "path": "font/rouble-bold.png", "y_offset": 0, @@ -1694,6 +1718,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/s-caron-uc-tiny.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/s-caron-tiny.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, { "path": "font/rouble-tiny.png", "y_offset": 0, diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index 735ca267d1..ded9cf5358 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -67,6 +67,8 @@ static const std::map codepointOffsetMap = { { UnicodeChar::s_acute, CSChar::s_acute - CS_SPRITE_FONT_OFFSET }, { UnicodeChar::s_cedilla_uc, SPR_G2_S_CEDILLA_UPPER - SPR_CHAR_START }, { 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::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 }, diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 98af5976f7..0fbf162cdf 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -921,8 +921,10 @@ enum 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 + 78, + SPR_G2_S_CARON_UPPER = SPR_G2_CHAR_BEGIN + 78, + SPR_G2_S_CARON_LOWER = SPR_G2_CHAR_BEGIN + 79, + + SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 80, SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1,