From 43d4a20b797bf38373aec75e8ae7304925f897f6 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 24 Feb 2019 22:31:02 +0100 Subject: [PATCH] Add N with caron --- resources/g2/font/latin/n-caron-bold.png | Bin 0 -> 171 bytes resources/g2/font/latin/n-caron-small.png | Bin 0 -> 171 bytes resources/g2/font/latin/n-caron-tiny.png | Bin 0 -> 172 bytes resources/g2/font/latin/n-caron-uc-bold.png | Bin 0 -> 193 bytes resources/g2/font/latin/n-caron-uc-small.png | Bin 0 -> 183 bytes resources/g2/font/latin/n-caron-uc-tiny.png | Bin 0 -> 179 bytes resources/g2/sprites.json | 36 +++++++++++++++++++ src/openrct2/drawing/Font.cpp | 2 ++ src/openrct2/sprites.h | 5 ++- 9 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 resources/g2/font/latin/n-caron-bold.png create mode 100644 resources/g2/font/latin/n-caron-small.png create mode 100644 resources/g2/font/latin/n-caron-tiny.png create mode 100644 resources/g2/font/latin/n-caron-uc-bold.png create mode 100644 resources/g2/font/latin/n-caron-uc-small.png create mode 100644 resources/g2/font/latin/n-caron-uc-tiny.png 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 0000000000000000000000000000000000000000..438634bc254c5895c4f2909b5cf319c1d7152c60 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?LJV?mi&u1ysY}>FVdQ I&MBb@04`xFpa1{> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..97630bad3d0d516a9ed752d86b4dad253978c801 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ##0(@~B^+M>q<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?Iev=AsH>FMGa!f`$MLPElfa|akymKz$Jv0-pM#=~H7jdjn`j5sr(A_h-a KKbLh*2~7akGA#`N literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ae2f8b59763fb1c55062036a850266bfe7bb6e4b GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRY#0(@anEQ7CDV_kI5Z6@Q^bUsq{~0=rjsLg* z{Tl-mXDkWw3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=fu;z9FeAgPITAoY_7YEDSN6wD z5~4z;?T4+t1BLWFT^vI=t|uo1B_uqUbNIl5(4z+o-o9jPTj||s@s;85mJ7^0mzOhb f)MB~)!I*(T;XR+J|CHEGK%ESpu6{1-oD!M_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?c#9>E@pFSS-H9`d*;{yc7`m7_ VC!7wo@&&4A@O1TaS?83{1OP>BF2n!; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5d61b21ac304b89f93ba96d00aa007d4cb37b0c7 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJx#0(^tuSi=Bq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW? 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,