diff --git a/resources/g2/font/latin/u-ring-bold.png b/resources/g2/font/latin/u-ring-bold.png new file mode 100644 index 0000000000..d818014dcf Binary files /dev/null and b/resources/g2/font/latin/u-ring-bold.png differ diff --git a/resources/g2/font/latin/u-ring-small.png b/resources/g2/font/latin/u-ring-small.png new file mode 100644 index 0000000000..3f3afb4658 Binary files /dev/null and b/resources/g2/font/latin/u-ring-small.png differ diff --git a/resources/g2/font/latin/u-ring-tiny.png b/resources/g2/font/latin/u-ring-tiny.png new file mode 100644 index 0000000000..c17b58b991 Binary files /dev/null and b/resources/g2/font/latin/u-ring-tiny.png differ diff --git a/resources/g2/font/latin/u-ring-uc-bold.png b/resources/g2/font/latin/u-ring-uc-bold.png new file mode 100644 index 0000000000..2a921028cd Binary files /dev/null and b/resources/g2/font/latin/u-ring-uc-bold.png differ diff --git a/resources/g2/font/latin/u-ring-uc-small.png b/resources/g2/font/latin/u-ring-uc-small.png new file mode 100644 index 0000000000..581629045c Binary files /dev/null and b/resources/g2/font/latin/u-ring-uc-small.png differ diff --git a/resources/g2/font/latin/u-ring-uc-tiny.png b/resources/g2/font/latin/u-ring-uc-tiny.png new file mode 100644 index 0000000000..908bb60214 Binary files /dev/null and b/resources/g2/font/latin/u-ring-uc-tiny.png differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index f00aae5fac..394671e5e5 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -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, diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index ded9cf5358..ccbce487d6 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -69,6 +69,10 @@ static const std::map 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 }, diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 0fbf162cdf..9600cc522c 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -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,