diff --git a/resources/g2/font/latin/r-caron-bold.png b/resources/g2/font/latin/r-caron-bold.png new file mode 100644 index 0000000000..65dbf1c4f8 Binary files /dev/null and b/resources/g2/font/latin/r-caron-bold.png differ diff --git a/resources/g2/font/latin/r-caron-small.png b/resources/g2/font/latin/r-caron-small.png new file mode 100644 index 0000000000..4877c59bac Binary files /dev/null and b/resources/g2/font/latin/r-caron-small.png differ diff --git a/resources/g2/font/latin/r-caron-tiny.png b/resources/g2/font/latin/r-caron-tiny.png new file mode 100644 index 0000000000..624312b791 Binary files /dev/null and b/resources/g2/font/latin/r-caron-tiny.png differ diff --git a/resources/g2/font/latin/r-caron-uc-bold.png b/resources/g2/font/latin/r-caron-uc-bold.png new file mode 100644 index 0000000000..c802499ed5 Binary files /dev/null and b/resources/g2/font/latin/r-caron-uc-bold.png differ diff --git a/resources/g2/font/latin/r-caron-uc-small.png b/resources/g2/font/latin/r-caron-uc-small.png new file mode 100644 index 0000000000..8bec8f344e Binary files /dev/null and b/resources/g2/font/latin/r-caron-uc-small.png differ diff --git a/resources/g2/font/latin/r-caron-uc-tiny.png b/resources/g2/font/latin/r-caron-uc-tiny.png new file mode 100644 index 0000000000..48c6632cf4 Binary files /dev/null and b/resources/g2/font/latin/r-caron-uc-tiny.png differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 775a67f7ed..bec93c5b82 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -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, diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index ffebab11dc..735ca267d1 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -61,6 +61,8 @@ static const std::map 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 }, diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index cad340541b..98af5976f7 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -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,