From ff12d5c2028b2375ca1e70e48adc16f2e9142e54 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 25 Mar 2019 17:02:35 +0100 Subject: [PATCH] Add Z with caron --- resources/g2/font/latin/z-caron-bold.png | Bin 0 -> 180 bytes resources/g2/font/latin/z-caron-small.png | Bin 0 -> 182 bytes resources/g2/font/latin/z-caron-tiny.png | Bin 0 -> 171 bytes resources/g2/font/latin/z-caron-uc-bold.png | Bin 0 -> 190 bytes resources/g2/font/latin/z-caron-uc-small.png | Bin 0 -> 185 bytes resources/g2/font/latin/z-caron-uc-tiny.png | Bin 0 -> 176 bytes resources/g2/sprites.json | 36 +++++++++++++++++++ src/openrct2/drawing/Font.cpp | 2 ++ src/openrct2/sprites.h | 4 ++- 9 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 resources/g2/font/latin/z-caron-bold.png create mode 100644 resources/g2/font/latin/z-caron-small.png create mode 100644 resources/g2/font/latin/z-caron-tiny.png create mode 100644 resources/g2/font/latin/z-caron-uc-bold.png create mode 100644 resources/g2/font/latin/z-caron-uc-small.png create mode 100644 resources/g2/font/latin/z-caron-uc-tiny.png diff --git a/resources/g2/font/latin/z-caron-bold.png b/resources/g2/font/latin/z-caron-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..f4a69f936d7f69d88b57e1c98aa7d88eb6bd2294 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?q<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?J+R>F0fVg#2iG+;er9O4Vm_>6aQz_!@hljQC0!qCAg>jC6&7I;J!Gca%qgD@k*tT_@uLG}_)Usv|W z%#!@(jJIBvT>}b9c)B=-a9mG*kdP3NoG_!R;ov8RDT(J97}Qp?m}~FRGY6_+@O1Ta JS?83{1OUqvEiM26 literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/z-caron-uc-bold.png b/resources/g2/font/latin/z-caron-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..9503ac8284e8fde101cd577124e73162390a3c9b GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRY#0(@anEQ7CDV_kI5Z6@Q^bUsq{~0=rjsLg* z{Tl-mXDkWw3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=fu;z9FeAgPITAoY_7YEDSN6xu zlKf`sg8vU?0fn?ZT^vI=t|vc;I(T4#)VTu-wstipX1!o!`@ND~Vn##FIf(@oVlF&7 c|K>9?+=}2_!@hljQC0!qCAg>jC6&7I;J!15FVIVMc~ob0mO*>?NMQuI!JQ zCHYN_!ud;`fI@1XE{-7_*OMPa9atcBc)`}D#4L;Ezr}3JEP3Xz^1Nb~NON@g$H36d Wz**kAaP=Ob4hBzGKbLh*2~7Y2fH8ak literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/z-caron-uc-tiny.png b/resources/g2/font/latin/z-caron-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..5bff847a48c20cc805e6c02baa8abba4648329bc GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c#0(^T=HFcbq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?p0+YJlFz;kcgsAR!?jIblXs!@*As%~s5ZbqsFLV`MPSXSuZZdnCvz N22WQ%mvv4FO#sRHFg*YO literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 394671e5e5..f1b78eacbb 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -856,6 +856,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/z-caron-uc-small.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/z-caron-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, { "path": "font/rouble-small.png", "y_offset": 0, @@ -1325,6 +1337,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/z-caron-uc-bold.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/z-caron-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, { "path": "font/rouble-bold.png", "y_offset": 0, @@ -1802,6 +1826,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/z-caron-uc-tiny.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/z-caron-tiny.png", + "y_offset": 0, + "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 ccbce487d6..4700057ab9 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -79,6 +79,8 @@ static const std::map codepointOffsetMap = { { UnicodeChar::z_acute, CSChar::z_acute - CS_SPRITE_FONT_OFFSET }, { UnicodeChar::z_dot_uc, CSChar::z_dot_uc - CS_SPRITE_FONT_OFFSET }, { UnicodeChar::z_dot, CSChar::z_dot - CS_SPRITE_FONT_OFFSET }, + { UnicodeChar::z_caron_uc, SPR_G2_Z_CARON_UPPER - SPR_CHAR_START }, + { UnicodeChar::z_caron, SPR_G2_Z_CARON_LOWER - SPR_CHAR_START }, { UnicodeChar::f_with_hook_uc, 'F' - CS_SPRITE_FONT_OFFSET }, { UnicodeChar::s_comma_uc, SPR_G2_S_CEDILLA_UPPER - SPR_CHAR_START }, // No visual difference { UnicodeChar::s_comma, SPR_G2_S_CEDILLA_LOWER - SPR_CHAR_START }, // Ditto diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 9600cc522c..2cfec914c0 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -927,8 +927,10 @@ enum 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_Z_CARON_UPPER = SPR_G2_CHAR_BEGIN + 84, + SPR_G2_Z_CARON_LOWER = SPR_G2_CHAR_BEGIN + 85, - SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 84, + SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 86, SPR_G2_CHAR_END = SPR_G2_ROUBLE_SIGN, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1,