diff --git a/resources/image/little.png b/resources/image/little.png index ce1552d..0249e75 100644 Binary files a/resources/image/little.png and b/resources/image/little.png differ diff --git a/resources/image/text.png b/resources/image/text.png index bdb0722..fc1677e 100644 Binary files a/resources/image/text.png and b/resources/image/text.png differ diff --git a/src/blupi.cxx b/src/blupi.cxx index e55aab0..e8178b7 100644 --- a/src/blupi.cxx +++ b/src/blupi.cxx @@ -981,7 +981,7 @@ DoInit (int argc, char * argv[], bool & exit) } totalDim.x = DIMTEXTX * 16; - totalDim.y = DIMTEXTY * 14 * 3; + totalDim.y = DIMTEXTY * 16 * 3; iconDim.x = DIMTEXTX; iconDim.y = DIMTEXTY; if (!g_pPixmap->Cache (CHTEXT, "image/text.png", totalDim, iconDim)) @@ -991,7 +991,7 @@ DoInit (int argc, char * argv[], bool & exit) } totalDim.x = DIMLITTLEX * 16; - totalDim.y = DIMLITTLEY * 14; + totalDim.y = DIMLITTLEY * 16; iconDim.x = DIMLITTLEX; iconDim.y = DIMLITTLEY; if (!g_pPixmap->Cache (CHLITTLE, "image/little.png", totalDim, iconDim)) diff --git a/src/text.cxx b/src/text.cxx index 226a622..cb42645 100644 --- a/src/text.cxx +++ b/src/text.cxx @@ -56,6 +56,17 @@ GetOffset (const char *& c) /* ń ź ż ł ś Ş ş */ 0x84, 0xBA, 0xBC, 0x82, 0x9B, 0x9E, 0x9F, }; + + static const unsigned char table_d7[] = { + /*a ז ו ה ד ג ב א */ + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, + /*a מ ל ך כ י ט ח */ + 0x97, 0x98, 0x99, 0x9B, 0x9A, 0x9C, 0x9E, + /*a ף פ ע ס ן נ ם */ + 0x9D, 0xA0, 0x9F, 0xA1, 0xA2, 0xA4, 0xA3, + /*a ת ש ר ק ץ צ */ + 0xA6, 0xA5, 0xA7, 0xA8, 0xA9, 0xAA, + }; /* clang-format on */ int offset = 0; @@ -83,6 +94,12 @@ GetOffset (const char *& c) size = countof (table_c5); inc = 1; break; + case 0xD7: + offset = 128 + 96; + table = table_d7; + size = countof (table_d7); + inc = 1; + break; } for (size_t i = 0; i < size; ++i) @@ -122,6 +139,8 @@ GetCharWidth (const char *& c, Sint32 font) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 7, 6, 7, 9, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 10, 10, 9, 9, 10, 6, 8, 10, 11, 7, 9, 9, 11, 11, 10, 7, + 7, 10, 10, 9, 10, 10, 11, 9, 9, 13, 11, 0, 0, 0, 0, 0, }; static const Uint8 table_width_little[] = @@ -140,6 +159,8 @@ GetCharWidth (const char *& c, Sint32 font) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 5, 5, 4, 5, 6, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 8, 8, 7, 7, 8, 4, 6, 8, 9, 5, 7, 7, 9, 9, 8, 5, + 5, 8, 8, 7, 8, 8, 9, 7, 7, 11, 9, 0, 0, 0, 0, 0, }; // clang-format on @@ -168,7 +189,7 @@ DrawText (CPixmap * pPixmap, Point pos, const char * pText, Sint32 font) if (font != FONTLITTLE) { - rank += 224 * font; + rank += 256 * font; pPixmap->DrawIcon (-1, CHTEXT, rank, pos); } else @@ -197,7 +218,7 @@ DrawTextPente ( rank = GetOffset (pText); auto inc = rank > 127; - rank += 224 * font; + rank += 256 * font; pPixmap->DrawIcon (-1, CHTEXT, rank, pos); lg = GetCharWidth (pText, font);