diff --git a/resources/g2/font/y-acute-bold.png b/resources/g2/font/y-acute-bold.png new file mode 100644 index 0000000000..9c5feb208f Binary files /dev/null and b/resources/g2/font/y-acute-bold.png differ diff --git a/resources/g2/font/y-acute-small.png b/resources/g2/font/y-acute-small.png new file mode 100644 index 0000000000..d4a6948427 Binary files /dev/null and b/resources/g2/font/y-acute-small.png differ diff --git a/resources/g2/font/y-acute-tiny.png b/resources/g2/font/y-acute-tiny.png new file mode 100644 index 0000000000..30d7ee5a43 Binary files /dev/null and b/resources/g2/font/y-acute-tiny.png differ diff --git a/resources/g2/font/y-acute-uc-bold.png b/resources/g2/font/y-acute-uc-bold.png new file mode 100644 index 0000000000..9a8f78294f Binary files /dev/null and b/resources/g2/font/y-acute-uc-bold.png differ diff --git a/resources/g2/font/y-acute-uc-small.png b/resources/g2/font/y-acute-uc-small.png new file mode 100644 index 0000000000..8364c106b7 Binary files /dev/null and b/resources/g2/font/y-acute-uc-small.png differ diff --git a/resources/g2/font/y-acute-uc-tiny.png b/resources/g2/font/y-acute-uc-tiny.png new file mode 100644 index 0000000000..fbf95955e4 Binary files /dev/null and b/resources/g2/font/y-acute-uc-tiny.png differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 3a9e046575..30a8ba031a 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -782,6 +782,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/y-acute-uc-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/y-acute-small.png", + "y_offset": 1, + "palette": "keep", + "forceBmp": true + }, { "path": "font/ae-uc-bold.png", "y_offset": 0, @@ -1125,6 +1137,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/y-acute-uc-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/y-acute-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, { "path": "font/ae-uc-tiny.png", "y_offset": 0, @@ -1475,5 +1499,17 @@ "y_offset": 0, "palette": "keep", "forceBmp": true + }, + { + "path": "font/y-acute-uc-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/y-acute-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true } ] diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index 58e16196d8..09e277214b 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -380,6 +380,10 @@ int32_t font_sprite_get_codepoint_offset(int32_t codepoint) return SPR_G2_C_CARON_UPPER - SPR_CHAR_START; case UNICODE_C_CARON: return SPR_G2_C_CARON_LOWER - SPR_CHAR_START; + case UNICODE_Y_ACUTE_UC: + return SPR_G2_Y_ACUTE_UPPER - SPR_CHAR_START; + case UNICODE_Y_ACUTE: + return SPR_G2_Y_ACUTE_LOWER - SPR_CHAR_START; default: if (codepoint < 32 || codepoint >= 256) @@ -562,6 +566,8 @@ bool font_supports_string_sprite(const utf8* text) case UNICODE_C_CARON_UC: case UNICODE_C_CARON: + case UNICODE_Y_ACUTE_UC: + case UNICODE_Y_ACUTE: supported = true; break; diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h index cb1596cf6f..702a302c53 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/src/openrct2/localisation/FormatCodes.h @@ -313,6 +313,8 @@ enum UnicodeCzech { UNICODE_C_CARON_UC = 268, UNICODE_C_CARON = 269, + UNICODE_Y_ACUTE_UC = 221, + UNICODE_Y_ACUTE = 253, }; #endif diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index e4f8db66df..9110a9858b 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -916,7 +916,10 @@ enum SPR_G2_C_CARON_UPPER = SPR_G2_CHAR_BEGIN + 62, SPR_G2_C_CARON_LOWER = SPR_G2_CHAR_BEGIN + 63, - SPR_G2_CHAR_END = SPR_G2_C_CARON_LOWER, + SPR_G2_Y_ACUTE_UPPER = SPR_G2_CHAR_BEGIN + 64, + SPR_G2_Y_ACUTE_LOWER = SPR_G2_CHAR_BEGIN + 65, + + SPR_G2_CHAR_END = SPR_G2_Y_ACUTE_LOWER, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, // 0x60000, chosen because it's a round hex number