mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixes to nofont.cpp

This commit is contained in:
Zeno Rogue 2023-04-11 18:13:38 +02:00
parent e9c2278e8e
commit 5b47779028
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nofont.cpp
View File

@ -114,16 +114,18 @@ unsigned char fonttable[] = {
43,16,0,130,19,93,155,204,237,251,244,214,152,45,0,6,248,255,8,252,110,0,5,252,255,9,254,54,0,4,252,250,159,68,17,16,107,254,255,3,143,0,4,175,32,0,5,179,255,3,163,0,11,177,255,3,129,0,10,43,250,255,2,253,38,0,9,34,223,255,3,130,0,9,60,232,255,3,154,1,0,8,104,250,255,2,254,132,1,0,7,6,154,255,3,237,74,0,8,25,198,255,3,201,30,0,8,11,229,255,10,192,0,3,20,255,11,192,0,3,20,255,11,192,0,255,0,67,
43,37,0,255,0,42,1,47,110,174,236,255,3,192,0,14,11,225,255,2,237,21,0,8,64,255,7,192,0,14,143,255,3,97,0,9,64,255,7,192,0,13,51,252,255,2,190,0,10,62,209,147,84,93,255,3,192,0,12,3,206,255,2,248,37,0,14,72,255,3,192,0,12,116,255,3,124,0,15,72,255,3,192,0,11,32,245,255,2,212,5,0,15,72,255,3,192,0,11,183,255,2,254,58,0,16,72,255,3,192,0,10,89,255,3,151,0,17,72,255,3,192,0,9,17,232,255,2,230,15,0,17,72,255,3,192,0,9,156,255,3,83,0,18,72,255,3,192,0,8,62,254,255,2,178,0,19,72,255,3,192,0,7,7,216,255,2,243,29,0,16,236,255,10,88,0,3,130,255,3,110,0,2,33,108,168,212,242,252,240,204,132,24,0,5,236,255,10,88,0,2,41,249,255,2,202,2,0,1,48,255,9,240,65,0,4,236,255,10,88,0,1,1,195,255,2,251,47,0,2,52,255,10,236,15,0,16,103,255,3,137,0,3,52,255,1,239,136,52,11,26,151,255,4,87,0,15,24,239,255,2,222,9,0,3,48,145,14,0,4,2,233,255,3,107,0,15,170,255,3,70,0,11,1,231,255,3,73,0,14,75,255,3,164,0,12,94,255,3,230,5,0,13,11,225,255,2,237,21,0,11,68,245,255,2,253,76,0,14,143,255,3,97,0,11,99,249,255,2,254,101,0,14,51,252,255,2,190,0,10,5,149,255,3,244,87,0,14,3,206,255,2,248,37,0,9,22,194,255,3,214,42,0,15,116,255,3,124,0,9,52,226,255,3,164,11,0,15,32,245,255,2,212,5,0,8,49,247,255,10,136,0,10,183,255,2,254,58,0,9,76,255,11,136,0,24,76,255,11,136,0,255,0,42,
43,31,0,255,0,2,19,86,148,201,221,240,250,233,214,184,123,60,2,0,16,32,149,247,255,11,218,101,6,0,13,98,247,255,15,207,35,0,11,149,255,18,239,61,0,9,120,255,20,236,33,0,7,61,253,255,6,251,150,61,19,7,29,92,201,255,7,207,2,0,6,194,255,6,237,52,0,6,1,132,255,7,89,0,5,62,255,6,254,65,0,9,164,255,6,213,0,5,141,255,6,171,0,10,23,249,255,6,35,0,4,208,255,6,73,0,11,173,255,6,102,0,3,3,254,255,5,254,14,48,255,8,204,0,1,113,255,6,152,0,3,22,255,6,227,0,1,48,255,8,204,0,1,72,255,6,173,0,3,42,255,6,211,0,1,48,255,8,204,0,1,56,255,6,193,0,3,42,255,6,210,0,1,48,255,8,204,0,1,55,255,6,194,0,3,23,255,6,226,0,1,48,255,8,204,0,1,72,255,6,173,0,3,4,254,255,5,253,13,0,11,112,255,6,153,0,4,210,255,6,72,0,11,172,255,6,104,0,4,142,255,6,170,0,10,21,249,255,6,36,0,4,63,255,6,254,62,0,9,162,255,6,215,0,6,196,255,6,235,50,0,6,1,128,255,7,91,0,6,63,254,255,6,250,148,59,17,6,28,90,199,255,7,210,2,0,7,123,255,20,237,36,0,9,153,255,18,241,64,0,11,103,248,255,15,210,37,0,13,35,152,247,255,11,220,104,7,0,16,20,88,150,202,223,242,251,234,216,186,125,62,3,0,255,0,33,
43,25,0,182,62,132,185,218,239,249,250,236,214,166,104,17,0,11,55,210,255,11,248,132,8,0,8,57,249,255,14,84,0,8,200,255,15,84,0,7,10,255,16,84,0,7,20,255,5,207,52,12,2,6,12,24,46,73,119,184,79,0,8,227,255,4,235,122,64,28,5,0,15,95,255,8,253,213,159,82,10,0,12,98,240,255,10,237,128,10,0,10,100,237,255,12,220,49,0,8,145,255,15,237,47,0,6,122,255,6,225,207,250,255,8,214,4,0,4,47,252,255,5,168,7,0,1,7,60,173,255,7,101,0,4,183,255,5,212,6,0,5,121,255,6,186,0,3,21,252,255,5,101,0,7,201,255,5,248,4,0,2,77,255,6,41,0,7,118,255,6,25,0,2,103,255,6,20,0,7,87,255,6,45,0,2,99,255,6,27,0,7,91,255,6,35,0,2,78,255,6,65,0,7,128,255,6,14,0,2,36,255,6,145,0,6,1,211,255,5,225,0,4,222,255,5,248,48,0,5,112,255,6,156,0,4,126,255,6,238,106,25,5,39,143,254,255,6,56,0,4,13,234,255,17,177,0,6,64,250,255,15,221,20,0,7,79,241,255,13,212,36,0,9,35,176,254,255,9,244,142,10,0,12,38,120,182,221,240,251,236,216,168,104,19,0,232,
43,25,0,182,62,132,185,218,239,249,250,236,214,166,104,17,0,11,54,210,255,11,248,132,8,0,8,57,249,255,14,84,0,8,200,255,15,84,0,7,11,255,16,84,0,7,20,255,5,207,52,12,2,6,12,24,46,73,119,184,79,0,8,227,255,4,235,122,64,28,5,0,15,95,255,8,253,213,159,82,10,0,12,98,240,255,10,237,128,10,0,10,100,237,255,12,220,49,0,8,145,255,15,237,47,0,6,122,255,6,225,207,250,255,8,214,4,0,4,47,252,255,5,168,7,0,1,7,60,173,255,7,101,0,4,183,255,5,212,6,0,5,121,255,6,186,0,3,21,252,255,5,101,0,7,201,255,5,248,4,0,2,77,255,6,41,0,7,118,255,6,25,0,2,103,255,6,20,0,7,87,255,6,45,0,2,99,255,6,27,0,7,91,255,6,35,0,2,78,255,6,65,0,7,128,255,6,14,0,2,36,255,6,145,0,6,1,211,255,5,225,0,4,222,255,5,248,48,0,5,112,255,6,156,0,4,126,255,6,238,106,25,5,39,143,254,255,6,56,0,4,13,234,255,17,177,0,6,64,250,255,15,221,20,0,7,79,241,255,13,212,36,0,9,35,176,254,255,9,244,142,10,0,12,38,120,182,221,240,251,236,216,168,104,19,0,232,
43,28,0,255,0,138,124,255,24,88,0,2,124,255,24,88,0,2,124,255,24,88,0,2,124,255,24,88,0,5,12,255,6,64,0,4,100,255,5,232,0,9,12,255,6,64,0,4,100,255,5,232,0,9,12,255,6,64,0,4,100,255,5,232,0,9,12,255,6,64,0,4,100,255,5,232,0,9,12,255,6,64,0,4,100,255,5,232,0,9,12,255,6,64,0,4,100,255,5,232,0,9,12,255,6,64,0,4,100,255,5,232,0,9,12,255,6,64,0,4,100,255,5,232,0,9,12,255,6,64,0,4,100,255,5,235,0,9,12,255,6,64,0,4,100,255,5,252,5,0,8,12,255,6,64,0,4,100,255,6,116,10,5,5,0,5,12,255,6,64,0,4,96,255,9,80,0,5,12,255,6,64,0,4,81,255,9,80,0,5,12,255,6,64,0,4,32,254,255,8,80,0,5,12,255,6,64,0,5,151,255,8,80,0,5,12,255,6,64,0,5,1,93,186,235,253,251,240,217,172,37,0,253,
43,29,0,185,84,92,92,92,92,92,30,0,22,236,255,5,84,0,22,236,255,5,84,0,22,236,255,5,84,0,22,236,255,5,84,0,22,236,255,5,84,0,22,236,255,5,84,0,21,2,237,255,5,87,0,17,4,79,156,210,247,255,6,254,226,182,110,27,0,12,69,218,255,14,248,139,5,0,9,81,251,255,17,181,2,0,7,24,238,255,19,111,0,7,154,255,6,241,251,255,5,236,255,6,243,15,0,5,16,245,255,5,234,32,236,255,5,85,161,255,6,110,0,5,89,255,6,92,0,1,236,255,5,84,13,232,255,5,193,0,5,148,255,5,231,4,0,1,236,255,5,84,0,1,131,255,5,246,5,0,4,186,255,5,165,0,2,236,255,5,84,0,1,62,255,6,33,0,4,204,255,5,132,0,2,236,255,5,84,0,1,29,255,6,51,0,4,208,255,5,125,0,2,236,255,5,84,0,1,22,255,6,56,0,4,188,255,5,144,0,2,236,255,5,84,0,1,41,255,6,35,0,4,159,255,5,195,0,2,236,255,5,84,0,1,92,255,5,251,10,0,4,92,255,5,254,45,0,1,236,255,5,84,1,195,255,5,195,0,5,20,246,255,5,221,38,236,255,5,88,151,255,6,114,0,6,139,255,6,243,249,255,5,237,255,6,232,10,0,6,16,218,255,18,254,85,0,8,37,234,255,17,122,0,10,31,201,255,14,242,96,0,12,1,90,195,254,255,9,229,138,22,0,16,23,77,244,255,5,144,46,2,0,20,236,255,5,84,0,22,236,255,5,84,0,22,236,255,5,84,0,22,236,255,5,84,0,22,236,255,5,84,0,22,236,255,5,84,0,22,114,124,124,124,124,124,40,0,40,
43,17,0,113,9,12,12,12,2,0,12,196,255,3,56,0,12,196,255,3,56,0,12,196,255,3,56,0,8,2,0,3,196,255,3,56,0,5,75,193,247,252,219,128,9,196,255,3,56,0,4,121,255,6,204,211,255,3,56,0,3,63,254,255,3,202,144,178,254,255,4,56,0,3,181,255,3,167,1,0,2,104,255,4,56,0,3,245,255,3,51,0,3,3,237,255,3,56,0,2,14,255,4,17,0,4,206,255,3,56,0,2,6,255,4,30,0,4,219,255,3,56,0,3,219,255,3,93,0,3,32,251,255,3,56,0,3,130,255,3,230,74,16,49,199,255,4,56,0,3,14,221,255,6,254,242,255,3,56,0,4,31,203,255,4,241,93,196,255,3,56,0,5,1,66,121,127,92,17,0,1,49,64,64,64,14,0,255,0,86,
43,30,0,255,0,202,2,29,38,9,0,8,7,32,20,0,13,5,121,230,255,2,247,155,15,0,4,26,167,247,255,2,219,101,1,0,9,2,175,255,6,214,21,0,2,33,230,255,6,153,0,9,111,255,8,193,1,3,202,255,8,100,0,7,7,235,255,2,201,110,112,219,255,3,104,113,255,3,196,123,124,214,255,2,232,6,0,6,78,255,2,192,3,0,2,13,196,255,2,234,239,255,2,110,0,3,7,199,255,2,76,0,6,135,255,2,60,0,4,20,227,255,4,131,0,5,60,255,2,134,0,6,163,255,1,249,2,0,5,71,255,3,214,6,0,5,3,250,255,1,161,0,6,171,255,1,234,0,7,193,255,2,221,7,0,6,234,255,1,170,0,6,155,255,2,12,0,5,42,250,255,3,134,0,5,14,255,2,154,0,6,115,255,2,109,0,4,15,207,255,4,253,71,0,4,113,255,2,112,0,6,46,255,2,239,69,0,2,49,205,255,2,198,192,255,2,244,78,0,2,54,238,255,2,43,0,7,193,255,3,230,230,255,3,252,52,47,250,255,3,215,214,255,3,191,0,8,42,245,255,7,130,0,2,120,255,7,248,44,0,9,65,236,255,5,149,1,0,3,131,254,255,4,242,76,0,11,19,117,173,185,151,62,0,6,57,154,190,182,128,27,0,255,0,111,
43,30,0,255,0,202,2,29,38,9,0,8,7,32,20,0,13,5,121,230,255,2,247,155,15,0,4,26,167,247,255,2,219,101,1,0,9,2,175,255,6,214,21,0,2,33,230,255,6,153,0,9,111,255,8,193,1,3,202,255,8,100,0,7,7,235,255,2,201,110,112,219,255,3,104,113,255,3,196,123,124,214,255,2,232,6,0,6,78,255,2,192,3,0,2,13,195,255,2,234,239,255,2,110,0,3,7,199,255,2,76,0,6,135,255,2,60,0,4,19,227,255,4,131,0,5,60,255,2,134,0,6,163,255,1,249,2,0,5,71,255,3,214,6,0,5,3,250,255,1,161,0,6,171,255,1,234,0,7,193,255,2,222,8,0,6,234,255,1,170,0,6,155,255,2,12,0,5,42,250,255,3,134,0,5,14,255,2,154,0,6,115,255,2,109,0,4,15,207,255,4,253,71,0,4,113,255,2,112,0,6,46,255,2,239,69,0,2,49,205,255,2,198,192,255,2,244,79,0,2,54,238,255,2,43,0,7,193,255,3,230,230,255,3,252,52,47,250,255,3,215,214,255,3,191,0,8,42,245,255,7,130,0,2,120,255,7,248,44,0,9,65,236,255,5,149,1,0,3,131,254,255,4,242,76,0,11,19,117,173,185,151,62,0,6,57,154,190,182,128,27,0,255,0,111,
43,51,0,255,0,64,45,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,15,0,14,57,242,255,34,44,0,13,57,242,255,35,44,0,12,57,242,255,2,249,200,200,226,255,3,251,200,200,200,200,200,200,200,200,200,200,200,200,200,200,200,200,235,255,3,245,200,200,254,255,2,44,0,11,56,241,255,2,249,75,0,2,16,204,255,3,134,0,14,69,247,255,2,244,63,0,2,248,255,2,44,0,10,56,241,255,2,249,75,0,4,16,204,255,3,134,0,12,69,247,255,2,244,63,0,3,248,255,2,44,0,9,56,241,255,2,249,76,0,6,16,204,255,3,134,0,10,70,247,255,2,244,63,0,4,248,255,2,44,0,8,56,241,255,2,249,77,0,8,16,204,255,3,134,0,8,70,247,255,2,244,63,0,5,248,255,2,44,0,7,56,241,255,2,249,77,0,10,16,204,255,3,134,0,6,70,247,255,2,244,63,0,6,248,255,2,44,0,6,56,241,255,2,249,78,0,12,16,204,255,3,134,0,4,70,247,255,2,244,63,0,7,248,255,2,44,0,5,55,241,255,2,250,78,0,14,16,204,255,3,134,0,2,71,247,255,2,244,63,0,8,248,255,2,44,0,4,55,241,255,2,250,79,0,16,16,204,255,3,134,71,247,255,2,244,63,0,9,248,255,2,44,0,3,55,241,255,2,250,80,0,18,16,204,255,3,252,255,2,244,63,0,10,248,255,2,44,0,2,55,241,255,2,250,80,0,20,16,204,255,4,244,63,0,11,248,255,2,44,0,2,180,255,3,180,0,22,80,255,4,166,0,12,248,255,2,44,0,2,12,196,255,3,147,0,20,63,244,255,5,138,0,11,248,255,2,44,0,3,12,196,255,3,148,0,18,63,244,255,2,242,213,255,3,138,0,10,248,255,2,44,0,4,12,196,255,3,149,0,16,63,244,255,2,242,58,19,209,255,3,138,0,9,248,255,2,44,0,5,12,196,255,3,149,1,0,13,63,244,255,2,242,58,0,2,19,209,255,3,138,0,8,248,255,2,44,0,6,12,196,255,3,150,1,0,11,63,244,255,2,242,58,0,4,19,209,255,3,138,0,7,248,255,2,44,0,7,12,196,255,3,150,1,0,9,63,244,255,2,242,58,0,6,19,209,255,3,138,0,6,248,255,2,44,0,8,12,196,255,3,151,1,0,7,63,244,255,2,243,59,0,8,19,209,255,3,138,0,5,248,255,2,44,0,9,12,196,255,3,152,1,0,5,63,244,255,2,243,59,0,10,19,209,255,3,138,0,4,248,255,2,44,0,10,12,196,255,3,153,1,0,3,63,244,255,2,243,60,0,12,19,209,255,3,138,0,3,248,255,2,44,0,11,12,196,255,3,154,32,32,74,244,255,2,251,92,32,32,32,32,32,32,32,32,32,32,32,32,32,32,51,226,255,3,140,32,32,249,255,2,44,0,12,12,196,255,36,44,0,13,12,196,255,35,44,0,14,12,195,255,34,44,0,255,0,206,
43,25,0,94,1,224,255,3,20,0,19,62,255,4,20,0,19,153,255,4,20,0,18,6,238,255,2,53,0,20,81,255,2,218,0,21,172,255,2,127,0,20,15,248,255,2,36,0,20,100,255,2,200,0,21,191,255,2,108,0,20,28,253,255,1,251,21,0,20,118,255,2,181,0,21,210,255,2,90,0,20,45,255,2,244,10,0,10,55,147,194,0,7,137,255,2,163,0,8,35,126,218,255,3,48,0,5,1,226,255,2,72,0,7,122,255,6,136,0,5,65,255,2,233,3,0,7,81,255,1,242,207,255,3,223,0,5,156,255,2,145,0,8,14,97,11,39,255,4,56,0,3,7,239,255,2,53,0,12,205,255,3,144,0,3,83,255,2,217,0,13,115,255,3,229,2,0,2,175,255,2,126,0,13,27,253,255,3,64,0,1,17,249,255,2,36,0,14,192,255,3,152,0,1,102,255,2,199,0,15,102,255,3,235,4,194,255,2,108,0,15,18,249,255,3,103,254,255,1,251,21,0,16,178,255,3,244,255,2,181,0,17,88,255,6,90,0,17,10,244,255,4,244,10,0,18,165,255,4,163,0,19,75,255,4,71,0,19,4,235,255,2,232,3,0,20,151,255,2,144,0,21,61,255,2,53,0,212,
255
};
#undef NUMEXTRA
#define NUMEXTRA 11
#define NUMEXTRA 13
unsigned char *ftv = fonttable;
@ -156,7 +158,7 @@ EX void loadCompressedChar(int &otwidth, int &otheight, unsigned char *tpix) {
#endif
#if CAP_CREATEFONT
void generateFont(int ch, SDL_Surface *txt) {
EX void generateFont(int ch, SDL_Surface *txt) {
if(ch >= 32) {
printf("%d,%d,", txt->h, txt->w);
int rle_last = -1, rle_q = 0;