[Scummvm-cvs-logs] SF.net SVN: scummvm: [26954] scummvm/trunk/engines/agos/charset.cpp
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Sun May 27 05:18:18 CEST 2007
Revision: 26954
http://scummvm.svn.sourceforge.net/scummvm/?rev=26954&view=rev
Author: Kirben
Date: 2007-05-26 20:18:18 -0700 (Sat, 26 May 2007)
Log Message:
-----------
Add font table for Elvira 1/2 and Waxworks.
Modified Paths:
--------------
scummvm/trunk/engines/agos/charset.cpp
Modified: scummvm/trunk/engines/agos/charset.cpp
===================================================================
--- scummvm/trunk/engines/agos/charset.cpp 2007-05-27 03:01:20 UTC (rev 26953)
+++ scummvm/trunk/engines/agos/charset.cpp 2007-05-27 03:18:18 UTC (rev 26954)
@@ -716,17 +716,218 @@
}
#ifdef PALMOS_68K
-static const byte *czech_windowFont;
-static const byte *russian_windowFont;
-static const byte *polish_windowFont;
-static const byte *french_windowFont;
-static const byte *german_windowFont;
-static const byte *hebrew_windowFont;
-static const byte *italian_windowFont;
-static const byte *spanish_windowFont;
-static const byte *english_windowFont;
+static const byte *feeble_windowFont;
+static const byte *czech_simonFont;
+static const byte *russian_simonFont;
+static const byte *polish_simonFont;
+static const byte *french_simonFont;
+static const byte *german_simonFont;
+static const byte *hebrew_simonFont;
+static const byte *italian_simonFont;
+static const byte *spanish_simonFont;
+static const byte *english_simonFont;
+static const byte *french_commonFont;
+static const byte *english_commonFont;
#else
-static const byte czech_windowFont[] = {
+static const byte feeble_windowFont[] = {
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 128,128,128,128,128,128,128,0,0,128,0,0,0,
+ 144,144,144,0,0,0,0,0,0,0,0,0,0,
+ 0,72,252,72,72,252,72,0,0,0,0,0,0,
+ 124,146,144,144,124,18,18,18,146,124,16,16,0,
+ 62,98,146,100,8,16,32,76,146,140,0,0,0,
+ 0,112,136,136,80,32,82,138,132,122,0,0,0,
+ 128,128,128,0,0,0,0,0,0,0,0,0,0,
+ 32,64,128,128,128,128,128,128,64,32,0,0,0,
+ 128,64,32,32,32,32,32,32,64,128,0,0,0,
+ 16,146,84,56,56,84,146,16,0,0,0,0,0,
+ 0,0,16,16,16,254,16,16,16,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,64,64,128,0,
+ 0,0,0,0,0,254,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,128,0,0,0,
+ 0,0,1,2,4,8,16,32,64,128,128,0,0,
+ 120,132,132,132,132,132,132,132,132,120,0,0,0,
+ 16,48,16,16,16,16,16,16,16,56,0,0,0,
+ 120,132,132,4,4,8,16,32,64,252,0,0,0,
+ 124,130,130,2,2,28,2,2,130,124,0,0,0,
+ 4,12,20,36,68,132,254,4,4,4,0,0,0,
+ 254,128,128,252,2,2,2,2,130,124,0,0,0,
+ 62,64,128,252,130,130,130,130,130,124,0,0,0,
+ 254,2,2,2,2,4,8,16,16,16,0,0,0,
+ 120,132,132,132,120,132,132,132,132,120,0,0,0,
+ 124,130,130,130,130,130,126,2,2,124,0,0,0,
+ 0,0,0,0,128,0,0,0,128,0,0,0,0,
+ 0,0,0,0,0,64,0,0,0,64,64,128,0,
+ 0,0,16,32,64,128,64,32,16,0,0,0,0,
+ 0,0,0,254,0,0,254,0,0,0,0,0,0,
+ 0,0,128,64,32,16,32,64,128,0,0,0,0,
+ 60,66,130,2,4,8,16,16,0,16,16,0,0,
+ 60,66,130,154,166,166,156,128,128,126,0,0,0,
+ 124,130,130,130,130,254,130,130,130,130,0,0,0,
+ 252,130,130,130,252,130,130,130,130,252,0,0,0,
+ 124,130,130,128,128,128,128,130,130,124,0,0,0,
+ 252,130,130,130,130,130,130,130,130,252,0,0,0,
+ 254,128,128,128,128,252,128,128,128,254,0,0,0,
+ 254,128,128,128,128,252,128,128,128,128,0,0,0,
+ 124,130,130,128,128,134,130,130,130,124,0,0,0,
+ 130,130,130,130,130,254,130,130,130,130,0,0,0,
+ 224,64,64,64,64,64,64,64,64,224,0,0,0,
+ 30,2,2,2,2,2,130,130,130,124,0,0,0,
+ 130,130,132,136,144,224,144,136,132,130,0,0,0,
+ 128,128,128,128,128,128,128,128,128,254,0,0,0,
+ 130,198,170,146,130,130,130,130,130,130,0,0,0,
+ 130,130,194,162,146,138,134,130,130,130,0,0,0,
+ 124,130,130,130,130,130,130,130,130,124,0,0,0,
+ 252,130,130,130,130,252,128,128,128,128,0,0,0,
+ 124,130,130,130,130,130,130,130,130,126,2,2,0,
+ 252,130,130,130,130,252,130,130,130,130,0,0,0,
+ 124,130,128,128,124,2,2,130,130,124,0,0,0,
+ 254,16,16,16,16,16,16,16,16,16,0,0,0,
+ 130,130,130,130,130,130,130,130,130,124,0,0,0,
+ 130,130,130,130,130,130,130,68,40,16,0,0,0,
+ 130,130,130,130,130,130,130,146,170,198,0,0,0,
+ 130,68,40,16,16,16,16,40,68,130,0,0,0,
+ 130,130,130,130,68,40,16,16,16,16,0,0,0,
+ 254,2,2,4,8,16,32,64,128,254,0,0,0,
+ 224,128,128,128,128,128,128,128,128,224,0,0,0,
+ 128,128,64,32,16,8,4,2,1,0,0,0,0,
+ 224,32,32,32,32,32,32,32,32,224,0,0,0,
+ 160,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,255,0,0,0,
+ 32,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,62,66,130,130,130,134,122,0,0,0,
+ 128,128,128,252,130,130,130,130,130,252,0,0,0,
+ 0,0,0,124,130,128,128,128,130,124,0,0,0,
+ 2,2,2,126,130,130,130,130,130,126,0,0,0,
+ 0,0,0,124,130,130,254,128,128,126,0,0,0,
+ 28,32,32,248,32,32,32,32,32,32,0,0,0,
+ 0,0,0,62,66,130,130,130,130,126,2,2,124,
+ 128,128,128,252,130,130,130,130,130,130,0,0,0,
+ 64,0,0,64,192,64,64,64,64,224,0,0,0,
+ 16,0,0,16,16,16,16,16,16,16,16,16,224,
+ 128,128,128,132,136,144,224,144,136,132,0,0,0,
+ 192,64,64,64,64,64,64,64,64,64,0,0,0,
+ 0,0,0,252,146,146,146,146,146,146,0,0,0,
+ 0,0,0,156,162,194,130,130,130,130,0,0,0,
+ 0,0,0,124,130,130,130,130,130,124,0,0,0,
+ 0,0,0,252,130,130,130,130,130,252,128,128,128,
+ 0,0,0,126,130,130,130,130,130,126,2,2,2,
+ 0,0,0,156,162,194,128,128,128,128,0,0,0,
+ 0,0,0,124,128,128,120,4,4,248,0,0,0,
+ 32,32,32,248,32,32,32,32,32,28,0,0,0,
+ 0,0,0,130,130,130,130,130,130,126,0,0,0,
+ 0,0,0,130,130,130,130,68,40,16,0,0,0,
+ 0,0,0,146,146,146,146,146,146,124,0,0,0,
+ 0,0,0,130,68,40,16,40,68,130,0,0,0,
+ 0,0,0,130,130,130,130,130,130,126,2,2,124,
+ 0,0,0,254,4,8,16,32,64,254,0,0,0,
+ 48,64,64,64,64,128,64,64,64,64,48,0,0,
+ 128,128,128,128,128,128,128,128,128,128,128,128,0,
+ 192,32,32,32,32,16,32,32,32,32,192,0,0,
+ 152,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,254,0,0,
+ 124,130,130,128,128,128,128,130,130,124,16,16,48,
+ 0,40,0,130,130,130,130,130,130,126,0,0,0,
+ 16,32,0,124,130,130,254,128,128,126,0,0,0,
+ 16,40,0,62,66,130,130,130,134,122,0,0,0,
+ 0,40,0,62,66,130,130,130,134,122,0,0,0,
+ 16,8,0,62,66,130,130,130,134,122,0,0,0,
+ 8,20,8,62,66,130,130,130,134,122,0,0,0,
+ 0,0,0,124,130,128,128,128,130,124,16,16,48,
+ 16,40,0,124,130,130,254,128,128,126,0,0,0,
+ 0,40,0,124,130,130,254,128,128,126,0,0,0,
+ 16,8,0,124,130,130,254,128,128,126,0,0,0,
+ 0,160,0,64,192,64,64,64,64,224,0,0,0,
+ 64,160,0,64,192,64,64,64,64,224,0,0,0,
+ 128,64,0,64,192,64,64,64,64,224,0,0,0,
+ 40,0,124,130,130,130,254,130,130,130,0,0,0,
+ 16,40,124,130,130,130,254,130,130,130,0,0,0,
+ 40,0,254,128,128,252,128,128,128,254,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,0,0,0,0,
+ 16,40,0,124,130,130,130,130,130,124,0,0,0,
+ 0,40,0,124,130,130,130,130,130,124,0,0,0,
+ 32,16,0,124,130,130,130,130,130,124,0,0,0,
+ 16,40,0,130,130,130,130,130,130,126,0,0,0,
+ 16,8,0,130,130,130,130,130,130,126,0,0,0,
+ 0,40,0,130,130,130,130,130,130,126,2,2,124,
+ 40,0,124,130,130,130,130,130,130,124,0,0,0,
+ 40,0,130,130,130,130,130,130,130,124,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,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,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 8,16,0,62,66,130,130,130,134,122,0,0,0,
+ 64,128,0,64,192,64,64,64,64,224,0,0,0,
+ 16,32,0,124,130,130,130,130,130,124,0,0,0,
+ 8,16,0,130,130,130,130,130,130,126,0,0,0,
+ 20,40,0,156,162,194,130,130,130,130,0,0,0,
+ 20,40,130,194,162,146,138,134,130,130,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,0,0,0,0,
+ 16,16,0,16,16,32,64,128,130,132,120,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,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,0,0,0,0,
+ 128,0,0,128,128,128,128,128,128,128,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,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,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,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,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,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,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,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,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,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,
+ 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,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,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,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,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,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,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,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,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,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,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,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,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,
+ 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,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,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,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 60,66,130,130,130,132,132,130,130,130,156,128,128,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,
+};
+
+static const byte czech_simonFont[] = {
0, 0, 0, 0, 0, 0, 0, 0,
32, 112, 112, 32, 32, 0, 32, 0,
48, 48, 96, 0, 0, 0, 0, 0,
@@ -827,7 +1028,7 @@
240, 240, 240, 240, 240, 240, 240, 240,
};
-static const byte russian_windowFont[] = {
+static const byte russian_simonFont[] = {
0, 0, 0, 0, 0, 0, 0, 0,
32, 112, 112, 32, 32, 0, 32, 0,
48, 48, 96, 0, 0, 0, 0, 0,
@@ -928,7 +1129,7 @@
240, 240, 240, 240, 240, 240, 240, 240,
};
-static const byte polish_windowFont[] = {
+static const byte polish_simonFont[] = {
0, 0, 0, 0, 0, 0, 0, 0,
32, 112, 112, 32, 32, 0, 32, 0,
48, 48, 96, 0, 0, 0, 0, 0,
@@ -1029,7 +1230,7 @@
240, 240, 240, 240, 240, 240, 240, 240,
};
-static const byte french_windowFont[] = {
+static const byte french_simonFont[] = {
0, 0, 0, 0, 0, 0, 0, 0,
32, 112, 112, 32, 32, 0, 32, 0,
48, 48, 96, 0, 0, 0, 0, 0,
@@ -1130,7 +1331,7 @@
240, 240, 240, 240, 240, 240, 240, 240,
};
-static const byte german_windowFont[] = {
+static const byte german_simonFont[] = {
0, 0, 0, 0, 0, 0, 0, 0,
32, 112, 112, 32, 32, 0, 32, 0,
48, 48, 96, 0, 0, 0, 0, 0,
@@ -1231,7 +1432,7 @@
240, 240, 240, 240, 240, 240, 240, 240,
};
-static const byte hebrew_windowFont[] = {
+static const byte hebrew_simonFont[] = {
0, 0, 0, 0, 0, 0, 0, 0,
32, 112, 112, 32, 32, 0, 32, 0,
48, 48, 96, 0, 0, 0, 0, 0,
@@ -1332,7 +1533,7 @@
240, 240, 240, 240, 240, 240, 240, 240,
};
-static const byte italian_windowFont[] = {
+static const byte italian_simonFont[] = {
0, 0, 0, 0, 0, 0, 0, 0,
32, 112, 112, 32, 32, 0, 32, 0,
48, 48, 96, 0, 0, 0, 0, 0,
@@ -1433,7 +1634,7 @@
240, 240, 240, 240, 240, 240, 240, 240,
};
-static const byte spanish_windowFont[] = {
+static const byte spanish_simonFont[] = {
0, 0, 0, 0, 0, 0, 0, 0,
32, 112, 112, 32, 32, 0, 32, 0,
48, 48, 96, 0, 0, 0, 0, 0,
@@ -1534,7 +1735,7 @@
240, 240, 240, 240, 240, 240, 240, 240,
};
-static const byte english_windowFont[] = {
+static const byte english_simonFont[] = {
0, 0, 0, 0, 0, 0, 0, 0,
32, 112, 112, 32, 32, 0, 32, 0,
48, 48, 96, 0, 0, 0, 0, 0,
@@ -1634,206 +1835,210 @@
252, 252, 252, 252, 252, 252, 252, 252,
240, 240, 240, 240, 240, 240, 240, 240,
};
-#endif
-static const byte feeble_windowFont[] = {
- 0,0,0,0,0,0,0,0,0,0,0,0,0,
- 128,128,128,128,128,128,128,0,0,128,0,0,0,
- 144,144,144,0,0,0,0,0,0,0,0,0,0,
- 0,72,252,72,72,252,72,0,0,0,0,0,0,
- 124,146,144,144,124,18,18,18,146,124,16,16,0,
- 62,98,146,100,8,16,32,76,146,140,0,0,0,
- 0,112,136,136,80,32,82,138,132,122,0,0,0,
- 128,128,128,0,0,0,0,0,0,0,0,0,0,
- 32,64,128,128,128,128,128,128,64,32,0,0,0,
- 128,64,32,32,32,32,32,32,64,128,0,0,0,
- 16,146,84,56,56,84,146,16,0,0,0,0,0,
- 0,0,16,16,16,254,16,16,16,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,64,64,128,0,
- 0,0,0,0,0,254,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,128,0,0,0,
- 0,0,1,2,4,8,16,32,64,128,128,0,0,
- 120,132,132,132,132,132,132,132,132,120,0,0,0,
- 16,48,16,16,16,16,16,16,16,56,0,0,0,
- 120,132,132,4,4,8,16,32,64,252,0,0,0,
- 124,130,130,2,2,28,2,2,130,124,0,0,0,
- 4,12,20,36,68,132,254,4,4,4,0,0,0,
- 254,128,128,252,2,2,2,2,130,124,0,0,0,
- 62,64,128,252,130,130,130,130,130,124,0,0,0,
- 254,2,2,2,2,4,8,16,16,16,0,0,0,
- 120,132,132,132,120,132,132,132,132,120,0,0,0,
- 124,130,130,130,130,130,126,2,2,124,0,0,0,
- 0,0,0,0,128,0,0,0,128,0,0,0,0,
- 0,0,0,0,0,64,0,0,0,64,64,128,0,
- 0,0,16,32,64,128,64,32,16,0,0,0,0,
- 0,0,0,254,0,0,254,0,0,0,0,0,0,
- 0,0,128,64,32,16,32,64,128,0,0,0,0,
- 60,66,130,2,4,8,16,16,0,16,16,0,0,
- 60,66,130,154,166,166,156,128,128,126,0,0,0,
- 124,130,130,130,130,254,130,130,130,130,0,0,0,
- 252,130,130,130,252,130,130,130,130,252,0,0,0,
- 124,130,130,128,128,128,128,130,130,124,0,0,0,
- 252,130,130,130,130,130,130,130,130,252,0,0,0,
- 254,128,128,128,128,252,128,128,128,254,0,0,0,
- 254,128,128,128,128,252,128,128,128,128,0,0,0,
- 124,130,130,128,128,134,130,130,130,124,0,0,0,
- 130,130,130,130,130,254,130,130,130,130,0,0,0,
- 224,64,64,64,64,64,64,64,64,224,0,0,0,
- 30,2,2,2,2,2,130,130,130,124,0,0,0,
- 130,130,132,136,144,224,144,136,132,130,0,0,0,
- 128,128,128,128,128,128,128,128,128,254,0,0,0,
- 130,198,170,146,130,130,130,130,130,130,0,0,0,
- 130,130,194,162,146,138,134,130,130,130,0,0,0,
- 124,130,130,130,130,130,130,130,130,124,0,0,0,
- 252,130,130,130,130,252,128,128,128,128,0,0,0,
- 124,130,130,130,130,130,130,130,130,126,2,2,0,
- 252,130,130,130,130,252,130,130,130,130,0,0,0,
- 124,130,128,128,124,2,2,130,130,124,0,0,0,
- 254,16,16,16,16,16,16,16,16,16,0,0,0,
- 130,130,130,130,130,130,130,130,130,124,0,0,0,
- 130,130,130,130,130,130,130,68,40,16,0,0,0,
- 130,130,130,130,130,130,130,146,170,198,0,0,0,
- 130,68,40,16,16,16,16,40,68,130,0,0,0,
- 130,130,130,130,68,40,16,16,16,16,0,0,0,
- 254,2,2,4,8,16,32,64,128,254,0,0,0,
- 224,128,128,128,128,128,128,128,128,224,0,0,0,
- 128,128,64,32,16,8,4,2,1,0,0,0,0,
- 224,32,32,32,32,32,32,32,32,224,0,0,0,
- 160,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,255,0,0,0,
- 32,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,62,66,130,130,130,134,122,0,0,0,
- 128,128,128,252,130,130,130,130,130,252,0,0,0,
- 0,0,0,124,130,128,128,128,130,124,0,0,0,
- 2,2,2,126,130,130,130,130,130,126,0,0,0,
- 0,0,0,124,130,130,254,128,128,126,0,0,0,
- 28,32,32,248,32,32,32,32,32,32,0,0,0,
- 0,0,0,62,66,130,130,130,130,126,2,2,124,
- 128,128,128,252,130,130,130,130,130,130,0,0,0,
- 64,0,0,64,192,64,64,64,64,224,0,0,0,
- 16,0,0,16,16,16,16,16,16,16,16,16,224,
- 128,128,128,132,136,144,224,144,136,132,0,0,0,
- 192,64,64,64,64,64,64,64,64,64,0,0,0,
- 0,0,0,252,146,146,146,146,146,146,0,0,0,
- 0,0,0,156,162,194,130,130,130,130,0,0,0,
- 0,0,0,124,130,130,130,130,130,124,0,0,0,
- 0,0,0,252,130,130,130,130,130,252,128,128,128,
- 0,0,0,126,130,130,130,130,130,126,2,2,2,
- 0,0,0,156,162,194,128,128,128,128,0,0,0,
- 0,0,0,124,128,128,120,4,4,248,0,0,0,
- 32,32,32,248,32,32,32,32,32,28,0,0,0,
- 0,0,0,130,130,130,130,130,130,126,0,0,0,
- 0,0,0,130,130,130,130,68,40,16,0,0,0,
- 0,0,0,146,146,146,146,146,146,124,0,0,0,
- 0,0,0,130,68,40,16,40,68,130,0,0,0,
- 0,0,0,130,130,130,130,130,130,126,2,2,124,
- 0,0,0,254,4,8,16,32,64,254,0,0,0,
- 48,64,64,64,64,128,64,64,64,64,48,0,0,
- 128,128,128,128,128,128,128,128,128,128,128,128,0,
- 192,32,32,32,32,16,32,32,32,32,192,0,0,
- 152,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,254,0,0,
- 124,130,130,128,128,128,128,130,130,124,16,16,48,
- 0,40,0,130,130,130,130,130,130,126,0,0,0,
- 16,32,0,124,130,130,254,128,128,126,0,0,0,
- 16,40,0,62,66,130,130,130,134,122,0,0,0,
- 0,40,0,62,66,130,130,130,134,122,0,0,0,
- 16,8,0,62,66,130,130,130,134,122,0,0,0,
- 8,20,8,62,66,130,130,130,134,122,0,0,0,
- 0,0,0,124,130,128,128,128,130,124,16,16,48,
- 16,40,0,124,130,130,254,128,128,126,0,0,0,
- 0,40,0,124,130,130,254,128,128,126,0,0,0,
- 16,8,0,124,130,130,254,128,128,126,0,0,0,
- 0,160,0,64,192,64,64,64,64,224,0,0,0,
- 64,160,0,64,192,64,64,64,64,224,0,0,0,
- 128,64,0,64,192,64,64,64,64,224,0,0,0,
- 40,0,124,130,130,130,254,130,130,130,0,0,0,
- 16,40,124,130,130,130,254,130,130,130,0,0,0,
- 40,0,254,128,128,252,128,128,128,254,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,0,0,0,0,
- 16,40,0,124,130,130,130,130,130,124,0,0,0,
- 0,40,0,124,130,130,130,130,130,124,0,0,0,
- 32,16,0,124,130,130,130,130,130,124,0,0,0,
- 16,40,0,130,130,130,130,130,130,126,0,0,0,
- 16,8,0,130,130,130,130,130,130,126,0,0,0,
- 0,40,0,130,130,130,130,130,130,126,2,2,124,
- 40,0,124,130,130,130,130,130,130,124,0,0,0,
- 40,0,130,130,130,130,130,130,130,124,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,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,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,
- 8,16,0,62,66,130,130,130,134,122,0,0,0,
- 64,128,0,64,192,64,64,64,64,224,0,0,0,
- 16,32,0,124,130,130,130,130,130,124,0,0,0,
- 8,16,0,130,130,130,130,130,130,126,0,0,0,
- 20,40,0,156,162,194,130,130,130,130,0,0,0,
- 20,40,130,194,162,146,138,134,130,130,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,0,0,0,0,
- 16,16,0,16,16,32,64,128,130,132,120,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,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,0,0,0,0,
- 128,0,0,128,128,128,128,128,128,128,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,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,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,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,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,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,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,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,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,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,
- 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,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,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,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,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,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,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,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,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,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,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,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,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,
- 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,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,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,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,
- 60,66,130,130,130,132,132,130,130,130,156,128,128,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,
+static const byte french_commonFont[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x20,
+ 0x00, 0x50, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00,
+ 0x20, 0x50, 0x00, 0x60, 0x90, 0x90, 0x60, 0x00,
+ 0x20, 0x50, 0x00, 0x60, 0x90, 0x90, 0x68, 0x00,
+ 0x30, 0x48, 0x80, 0x80, 0x48, 0x30, 0x10, 0x30,
+ 0x00, 0x10, 0x28, 0x10, 0x2A, 0x44, 0x3A, 0x00,
+ 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x00,
+ 0x00, 0x20, 0x10, 0x10, 0x10, 0x10, 0x20, 0x00,
+ 0x00, 0x00, 0x14, 0x08, 0x3E, 0x08, 0x14, 0x00,
+ 0x00, 0x70, 0x88, 0xF0, 0x88, 0x88, 0xF0, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x10,
+ 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00,
+ 0x10, 0x20, 0x00, 0x78, 0x70, 0x40, 0x38, 0x00,
+ 0x00, 0x70, 0x88, 0x88, 0x88, 0x88, 0x70, 0x00,
+ 0x00, 0x20, 0x60, 0x20, 0x20, 0x20, 0x70, 0x00,
+ 0x00, 0x70, 0x88, 0x10, 0x20, 0x48, 0xF8, 0x00,
+ 0x00, 0x70, 0x88, 0x30, 0x08, 0x88, 0x70, 0x00,
+ 0x00, 0x10, 0x20, 0x40, 0x90, 0xF8, 0x10, 0x00,
+ 0x00, 0xF8, 0x80, 0x70, 0x08, 0x88, 0x70, 0x00,
+ 0x00, 0x70, 0x88, 0x80, 0xF0, 0x88, 0x70, 0x00,
+ 0x00, 0xF8, 0x08, 0x10, 0x20, 0x40, 0x40, 0x00,
+ 0x00, 0x70, 0x88, 0x70, 0x88, 0x88, 0x70, 0x00,
+ 0x00, 0x70, 0x88, 0x78, 0x08, 0x88, 0x70, 0x00,
+ 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00,
+ 0x40, 0x20, 0x00, 0x60, 0x90, 0x90, 0x68, 0x00,
+ 0x20, 0x50, 0x00, 0x98, 0x90, 0x90, 0xE8, 0x00,
+ 0x20, 0x10, 0x00, 0x78, 0x70, 0x40, 0x38, 0x00,
+ 0x20, 0x50, 0x00, 0x78, 0x70, 0x40, 0x38, 0x00,
+ 0x00, 0x3C, 0x42, 0x04, 0x08, 0x00, 0x08, 0x00,
+ 0x20, 0x50, 0x00, 0x60, 0x20, 0x28, 0x30, 0x00,
+ 0x20, 0x50, 0x50, 0x70, 0x50, 0x50, 0x88, 0x00,
+ 0xF0, 0x48, 0x48, 0x70, 0x48, 0x48, 0xF0, 0x00,
+ 0x30, 0x48, 0x80, 0x80, 0x80, 0x48, 0x30, 0x00,
+ 0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00,
+ 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00,
+ 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00,
+ 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00,
+ 0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00,
+ 0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00,
+ 0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00,
+ 0xC8, 0x50, 0x60, 0x40, 0x60, 0x50, 0xC8, 0x00,
+ 0xE0, 0x40, 0x40, 0x40, 0x40, 0x48, 0xF8, 0x00,
+ 0x88, 0xD8, 0xA8, 0x88, 0x88, 0x88, 0x88, 0x00,
+ 0xC8, 0x48, 0x68, 0x58, 0x58, 0x48, 0xC8, 0x00,
+ 0x70, 0x88, 0x88, 0x88, 0x88, 0x88, 0x70, 0x00,
+ 0xF0, 0x48, 0x48, 0x70, 0x40, 0x40, 0xC0, 0x00,
+ 0x60, 0x90, 0x90, 0x90, 0xB0, 0x90, 0x68, 0x00,
+ 0xF0, 0x48, 0x48, 0x70, 0x50, 0x48, 0xC8, 0x00,
+ 0x70, 0x88, 0x80, 0x60, 0x10, 0x88, 0x70, 0x00,
+ 0xF8, 0xA8, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00,
+ 0x88, 0x50, 0x50, 0x50, 0x50, 0x50, 0x20, 0x00,
+ 0x88, 0x88, 0x88, 0x50, 0x50, 0x50, 0x20, 0x00,
+ 0x88, 0x88, 0x88, 0x88, 0xA8, 0xD8, 0x88, 0x00,
+ 0x88, 0x50, 0x70, 0x20, 0x70, 0x50, 0x88, 0x00,
+ 0x88, 0x48, 0x30, 0x20, 0x40, 0x80, 0xC0, 0x00,
+ 0xF8, 0x88, 0x10, 0x20, 0x40, 0x80, 0xF8, 0x00,
+ 0x00, 0x0E, 0x08, 0x08, 0x08, 0x08, 0x0E, 0x00,
+ 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x00,
+ 0x00, 0x70, 0x10, 0x10, 0x10, 0x10, 0x70, 0x00,
+ 0x00, 0x30, 0x48, 0x40, 0x48, 0x30, 0x10, 0x30,
+ 0x00, 0x50, 0x00, 0x60, 0x20, 0x28, 0x30, 0x00,
+ 0x20, 0x10, 0x00, 0x98, 0x90, 0x90, 0xE8, 0x00,
+ 0x00, 0x00, 0x60, 0x90, 0x90, 0x90, 0x68, 0x00,
+ 0x40, 0x40, 0x50, 0x68, 0x48, 0x48, 0xF0, 0x00,
+ 0x00, 0x00, 0x30, 0x48, 0x40, 0x48, 0x30, 0x00,
+ 0x10, 0x10, 0x70, 0x90, 0x90, 0x90, 0x68, 0x00,
+ 0x00, 0x00, 0x70, 0x48, 0x70, 0x40, 0x38, 0x00,
+ 0x10, 0x38, 0x20, 0x70, 0x20, 0x20, 0x20, 0x40,
+ 0x00, 0x00, 0x78, 0x90, 0x90, 0x90, 0x70, 0x10,
+ 0xC0, 0x40, 0x58, 0x68, 0x48, 0x48, 0xC8, 0x00,
+ 0x20, 0x00, 0x60, 0x20, 0x20, 0x28, 0x30, 0x00,
+ 0x10, 0x18, 0x10, 0x10, 0x10, 0x10, 0x10, 0x60,
+ 0x40, 0x40, 0x70, 0x48, 0x70, 0x50, 0xC8, 0x00,
+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x50, 0x60, 0x00,
+ 0x00, 0x00, 0xA8, 0xF8, 0xA8, 0xA8, 0xA8, 0x00,
+ 0x00, 0x00, 0xD8, 0x68, 0x48, 0x48, 0x48, 0x00,
+ 0x00, 0x00, 0x30, 0x48, 0x48, 0x48, 0x30, 0x00,
+ 0x00, 0x00, 0xF0, 0x48, 0x48, 0x70, 0x40, 0xC0,
+ 0x00, 0x00, 0x70, 0x90, 0x90, 0x70, 0x18, 0x10,
+ 0x00, 0x00, 0xD8, 0x68, 0x40, 0x40, 0xE0, 0x00,
+ 0x00, 0x00, 0x38, 0x40, 0x30, 0x08, 0x70, 0x00,
+ 0x20, 0x20, 0x70, 0x20, 0x20, 0x28, 0x30, 0x00,
+ 0x00, 0x00, 0x98, 0x90, 0x90, 0x90, 0xE8, 0x00,
+ 0x00, 0x00, 0x88, 0x88, 0x50, 0x50, 0x20, 0x00,
+ 0x00, 0x00, 0xA8, 0xA8, 0xA8, 0xF8, 0xA8, 0x00,
+ 0x00, 0x00, 0x88, 0x50, 0x20, 0x50, 0x88, 0x00,
+ 0x00, 0x00, 0x98, 0x90, 0x90, 0x70, 0x10, 0x60,
+ 0x00, 0x00, 0x78, 0x10, 0x20, 0x40, 0x78, 0x00,
+ 0x20, 0x50, 0x00, 0x60, 0x90, 0x90, 0x60, 0x00,
+ 0x00, 0x0E, 0x08, 0x30, 0x08, 0x08, 0x0E, 0x00,
+ 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+ 0x00, 0x70, 0x10, 0x0C, 0x10, 0x10, 0x70, 0x00,
+ 0x00, 0x14, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC,
+ 0x00, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0x00,
};
+static const byte english_commonFont[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x20,
+ 0x00, 0x50, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x90, 0x00, 0x60, 0x90, 0x90, 0x68, 0x00,
+ 0x00, 0x90, 0x00, 0x60, 0x90, 0x90, 0x60, 0x00,
+ 0x00, 0x90, 0x00, 0x90, 0x90, 0x90, 0x60, 0x00,
+ 0x00, 0x10, 0x28, 0x10, 0x2A, 0x44, 0x3A, 0x00,
+ 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x00,
+ 0x00, 0x20, 0x10, 0x10, 0x10, 0x10, 0x20, 0x00,
+ 0x00, 0x00, 0x14, 0x08, 0x3E, 0x08, 0x14, 0x00,
+ 0x00, 0x70, 0x88, 0xF0, 0x88, 0x88, 0xF0, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x10,
+ 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00,
+ 0x10, 0x20, 0x00, 0x78, 0x70, 0x40, 0x38, 0x00,
+ 0x00, 0x70, 0x88, 0x88, 0x88, 0x88, 0x70, 0x00,
+ 0x00, 0x20, 0x60, 0x20, 0x20, 0x20, 0x70, 0x00,
+ 0x00, 0x70, 0x88, 0x10, 0x20, 0x48, 0xF8, 0x00,
+ 0x00, 0x70, 0x88, 0x30, 0x08, 0x88, 0x70, 0x00,
+ 0x00, 0x10, 0x20, 0x40, 0x90, 0xF8, 0x10, 0x00,
+ 0x00, 0xF8, 0x80, 0x70, 0x08, 0x88, 0x70, 0x00,
+ 0x00, 0x70, 0x88, 0x80, 0xF0, 0x88, 0x70, 0x00,
+ 0x00, 0xF8, 0x08, 0x10, 0x20, 0x40, 0x40, 0x00,
+ 0x00, 0x70, 0x88, 0x70, 0x88, 0x88, 0x70, 0x00,
+ 0x00, 0x70, 0x88, 0x78, 0x08, 0x88, 0x70, 0x00,
+ 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00,
+ 0x40, 0x20, 0x00, 0x60, 0x90, 0x90, 0x68, 0x00,
+ 0x20, 0x50, 0x00, 0x98, 0x90, 0x90, 0xE8, 0x00,
+ 0x20, 0x10, 0x00, 0x78, 0x70, 0x40, 0x38, 0x00,
+ 0x20, 0x50, 0x00, 0x78, 0x70, 0x40, 0x38, 0x00,
+ 0x00, 0x3C, 0x42, 0x04, 0x08, 0x00, 0x08, 0x00,
+ 0x20, 0x50, 0x00, 0x60, 0x20, 0x28, 0x30, 0x00,
+ 0x20, 0x50, 0x50, 0x70, 0x50, 0x50, 0x88, 0x00,
+ 0xF0, 0x48, 0x48, 0x70, 0x48, 0x48, 0xF0, 0x00,
+ 0x30, 0x48, 0x80, 0x80, 0x80, 0x48, 0x30, 0x00,
+ 0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00,
+ 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00,
+ 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00,
+ 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00,
+ 0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00,
+ 0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00,
+ 0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00,
+ 0xC8, 0x50, 0x60, 0x40, 0x60, 0x50, 0xC8, 0x00,
+ 0xE0, 0x40, 0x40, 0x40, 0x40, 0x48, 0xF8, 0x00,
+ 0x88, 0xD8, 0xA8, 0x88, 0x88, 0x88, 0x88, 0x00,
+ 0xC8, 0x48, 0x68, 0x58, 0x58, 0x48, 0xC8, 0x00,
+ 0x70, 0x88, 0x88, 0x88, 0x88, 0x88, 0x70, 0x00,
+ 0xF0, 0x48, 0x48, 0x70, 0x40, 0x40, 0xC0, 0x00,
+ 0x60, 0x90, 0x90, 0x90, 0xB0, 0x90, 0x68, 0x00,
+ 0xF0, 0x48, 0x48, 0x70, 0x50, 0x48, 0xC8, 0x00,
+ 0x70, 0x88, 0x80, 0x60, 0x10, 0x88, 0x70, 0x00,
+ 0xF8, 0xA8, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00,
+ 0x88, 0x50, 0x50, 0x50, 0x50, 0x50, 0x20, 0x00,
+ 0x88, 0x88, 0x88, 0x50, 0x50, 0x50, 0x20, 0x00,
+ 0x88, 0x88, 0x88, 0x88, 0xA8, 0xD8, 0x88, 0x00,
+ 0x88, 0x50, 0x70, 0x20, 0x70, 0x50, 0x88, 0x00,
+ 0x88, 0x48, 0x30, 0x20, 0x40, 0x80, 0xC0, 0x00,
+ 0xF8, 0x88, 0x10, 0x20, 0x40, 0x80, 0xF8, 0x00,
+ 0x00, 0x0E, 0x08, 0x08, 0x08, 0x08, 0x0E, 0x00,
+ 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x00,
+ 0x00, 0x70, 0x10, 0x10, 0x10, 0x10, 0x70, 0x00,
+ 0x00, 0x30, 0x48, 0x40, 0x48, 0x30, 0x10, 0x30,
+ 0x00, 0x50, 0x00, 0x60, 0x20, 0x28, 0x30, 0x00,
+ 0x20, 0x10, 0x00, 0x98, 0x90, 0x90, 0xE8, 0x00,
+ 0x00, 0x00, 0x60, 0x90, 0x90, 0x90, 0x68, 0x00,
+ 0x40, 0x40, 0x50, 0x68, 0x48, 0x48, 0xF0, 0x00,
+ 0x00, 0x00, 0x30, 0x48, 0x40, 0x48, 0x30, 0x00,
+ 0x10, 0x10, 0x70, 0x90, 0x90, 0x90, 0x68, 0x00,
+ 0x00, 0x00, 0x70, 0x48, 0x70, 0x40, 0x38, 0x00,
+ 0x10, 0x38, 0x20, 0x70, 0x20, 0x20, 0x20, 0x40,
+ 0x00, 0x00, 0x78, 0x90, 0x90, 0x90, 0x70, 0x10,
+ 0xC0, 0x40, 0x58, 0x68, 0x48, 0x48, 0xC8, 0x00,
+ 0x20, 0x00, 0x60, 0x20, 0x20, 0x28, 0x30, 0x00,
+ 0x10, 0x18, 0x10, 0x10, 0x10, 0x10, 0x10, 0x60,
+ 0x40, 0x40, 0x70, 0x48, 0x70, 0x50, 0xC8, 0x00,
+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x50, 0x60, 0x00,
+ 0x00, 0x00, 0xA8, 0xF8, 0xA8, 0xA8, 0xA8, 0x00,
+ 0x00, 0x00, 0xD8, 0x68, 0x48, 0x48, 0x48, 0x00,
+ 0x00, 0x00, 0x30, 0x48, 0x48, 0x48, 0x30, 0x00,
+ 0x00, 0x00, 0xF0, 0x48, 0x48, 0x70, 0x40, 0xC0,
+ 0x00, 0x00, 0x70, 0x90, 0x90, 0x70, 0x18, 0x10,
+ 0x00, 0x00, 0xD8, 0x68, 0x40, 0x40, 0xE0, 0x00,
+ 0x00, 0x00, 0x38, 0x40, 0x30, 0x08, 0x70, 0x00,
+ 0x20, 0x20, 0x70, 0x20, 0x20, 0x28, 0x30, 0x00,
+ 0x00, 0x00, 0x98, 0x90, 0x90, 0x90, 0xE8, 0x00,
+ 0x00, 0x00, 0x88, 0x88, 0x50, 0x50, 0x20, 0x00,
+ 0x00, 0x00, 0xA8, 0xA8, 0xA8, 0xF8, 0xA8, 0x00,
+ 0x00, 0x00, 0x88, 0x50, 0x20, 0x50, 0x88, 0x00,
+ 0x00, 0x00, 0x98, 0x90, 0x90, 0x70, 0x10, 0x60,
+ 0x00, 0x00, 0x78, 0x10, 0x20, 0x40, 0x78, 0x00,
+ 0x20, 0x50, 0x00, 0x60, 0x90, 0x90, 0x60, 0x00,
+ 0x00, 0x0E, 0x08, 0x30, 0x08, 0x08, 0x0E, 0x00,
+ 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+ 0x00, 0x70, 0x10, 0x0C, 0x10, 0x10, 0x70, 0x00,
+ 0x00, 0x14, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC,
+ 0x00, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0xFC, 0x00,
+};
+#endif
+
void AGOSEngine::windowDrawChar(WindowBlock *window, uint x, uint y, byte chr) {
const byte *src;
byte color, *dst;
@@ -1851,41 +2056,62 @@
w = feebleFontSize[chr - 0x20];
src = feeble_windowFont + (chr - 0x20) * 13;
- } else {
+ } else if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
h = 8;
w = 6;
switch (_language) {
case Common::CZ_CZE:
- src = czech_windowFont + (chr - 0x20) * 8;
+ src = czech_simonFont + (chr - 0x20) * 8;
break;
case Common::RU_RUS:
- src = russian_windowFont + (chr - 0x20) * 8;
+ src = russian_simonFont + (chr - 0x20) * 8;
break;
case Common::PL_POL:
- src = polish_windowFont + (chr - 0x20) * 8;
+ src = polish_simonFont + (chr - 0x20) * 8;
break;
case Common::HB_ISR:
- src = hebrew_windowFont + (chr - 0x20) * 8;
+ src = hebrew_simonFont + (chr - 0x20) * 8;
break;
case Common::ES_ESP:
- src = spanish_windowFont + (chr - 0x20) * 8;
+ src = spanish_simonFont + (chr - 0x20) * 8;
break;
case Common::IT_ITA:
- src = italian_windowFont + (chr - 0x20) * 8;
+ src = italian_simonFont + (chr - 0x20) * 8;
break;
case Common::FR_FRA:
- src = french_windowFont + (chr - 0x20) * 8;
+ src = french_simonFont + (chr - 0x20) * 8;
break;
case Common::DE_DEU:
- src = german_windowFont + (chr - 0x20) * 8;
+ src = german_simonFont + (chr - 0x20) * 8;
break;
case Common::EN_ANY:
- src = english_windowFont + (chr - 0x20) * 8;
+ src = english_simonFont + (chr - 0x20) * 8;
break;
default:
error("windowDrawChar: Unknown language %d\n", _language);
}
+ } else {
+ h = 8;
+ w = 6;
+
+ // TODO: Add font tables for German and Spanish
+ switch (_language) {
+ case Common::ES_ESP:
+ src = english_commonFont + (chr - 0x20) * 8;
+ break;
+ case Common::FR_FRA:
+ src = french_commonFont + (chr - 0x20) * 8;
+ break;
+ case Common::DE_DEU:
+ src = english_commonFont + (chr - 0x20) * 8;
+ break;
+ case Common::EN_ANY:
+ src = english_commonFont + (chr - 0x20) * 8;
+ break;
+ default:
+ error("windowDrawChar: Unknown language %d\n", _language);
+ }
}
color = window->text_color;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list