diff --git a/resources/g2/font/latin/n-caron-bold.png b/resources/g2/font/latin/n-caron-bold.png new file mode 100644 index 0000000000..438634bc25 Binary files /dev/null and b/resources/g2/font/latin/n-caron-bold.png differ diff --git a/resources/g2/font/latin/n-caron-small.png b/resources/g2/font/latin/n-caron-small.png new file mode 100644 index 0000000000..97630bad3d Binary files /dev/null and b/resources/g2/font/latin/n-caron-small.png differ diff --git a/resources/g2/font/latin/n-caron-tiny.png b/resources/g2/font/latin/n-caron-tiny.png new file mode 100644 index 0000000000..6d96a8774a Binary files /dev/null and b/resources/g2/font/latin/n-caron-tiny.png differ diff --git a/resources/g2/font/latin/n-caron-uc-bold.png b/resources/g2/font/latin/n-caron-uc-bold.png new file mode 100644 index 0000000000..ae2f8b5976 Binary files /dev/null and b/resources/g2/font/latin/n-caron-uc-bold.png differ diff --git a/resources/g2/font/latin/n-caron-uc-small.png b/resources/g2/font/latin/n-caron-uc-small.png new file mode 100644 index 0000000000..02a8059422 Binary files /dev/null and b/resources/g2/font/latin/n-caron-uc-small.png differ diff --git a/resources/g2/font/latin/n-caron-uc-tiny.png b/resources/g2/font/latin/n-caron-uc-tiny.png new file mode 100644 index 0000000000..5d61b21ac3 Binary files /dev/null and b/resources/g2/font/latin/n-caron-uc-tiny.png differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 66046226a4..775a67f7ed 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -796,6 +796,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/n-caron-uc-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/n-caron-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, { "path": "font/rouble-small.png", "y_offset": 0, @@ -1205,6 +1217,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/n-caron-uc-bold.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/n-caron-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, { "path": "font/rouble-bold.png", "y_offset": 0, @@ -1622,6 +1646,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/n-caron-uc-tiny.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/n-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 ed0f492d1b..ffebab11dc 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -57,6 +57,8 @@ static const std::map codepointOffsetMap = { { UnicodeChar::l_stroke, CSChar::l_stroke - CS_SPRITE_FONT_OFFSET }, { UnicodeChar::n_acute_uc, CSChar::n_acute_uc - CS_SPRITE_FONT_OFFSET }, { UnicodeChar::n_acute, CSChar::n_acute - CS_SPRITE_FONT_OFFSET }, + { UnicodeChar::n_caron_uc, SPR_G2_N_CARON_UPPER - SPR_CHAR_START }, + { 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::s_acute_uc, CSChar::s_acute_uc - CS_SPRITE_FONT_OFFSET }, diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 392638a413..cad340541b 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -917,8 +917,11 @@ 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_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 74, + SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 76, SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1,