new V2 font (taken from german zak.exe)

svn-id: r7509

1 files changed, 157 insertions, 149 deletions

diff --git a/scumm/charset.cpp b/scumm/charset.cpp
index 0594db3364..98e7346ae9 100644
--- a/scumm/charset.cpp
+++ b/scumm/charset.cpp
@@ -173,160 +173,168 @@ void CharsetRenderer::addLinebreaks(int a, byte *str, int pos, int maxwidth) {
 }
 
 // German Zak font (should work for US version too).
-// See patch #732072 
 static byte charsetDataV2[] = {
-	0x89, 0x04, 0x00, 0x00, 0x63, 0x01, 0x80, 0x08,
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-	0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-	0x04, 0x04, 0x07, 0x08, 0x07, 0x07, 0x08, 0x04,
-	0x05, 0x05, 0x03, 0x08, 0x04, 0x06, 0x04, 0x08,
-	0x07, 0x04, 0x07, 0x07, 0x08, 0x07, 0x07, 0x07,
-	0x07, 0x07, 0x04, 0x04, 0x08, 0x08, 0x08, 0x07,
-	0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-	0x07, 0x03, 0x06, 0x07, 0x07, 0x08, 0x07, 0x07,
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x08,
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x08, 0x02, 0x08,
-	0x08, 0x07, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07,
-	0x07, 0x03, 0x05, 0x07, 0x04, 0x08, 0x07, 0x07,	// h i j k l m n o / 104 - 111
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x08,
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x08,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xc0, 0x80,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7e, 0x7c,
-	0x7c, 0x7e, 0x7f, 0x7e, 0x7e, 0x7e, 0x7e, 0x00,
-	0x00, 0xfe, 0xfe, 0xfe, 0xfc, 0xfe, 0x7e, 0x3e,
-	0x3e, 0x7e, 0xfe, 0x7e, 0x7e, 0x7e, 0x7e, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x1c, 0x20, 0x20, 0x20, 0x1c, 0x00,
-	0x04, 0x04, 0x3c, 0x44, 0x44, 0x44, 0x3c, 0x00,
-	0x00, 0x00, 0x38, 0x44, 0x78, 0x40, 0x3c, 0x00,
-	0x0c, 0x10, 0x38, 0x10, 0x10, 0x10, 0x10, 0x00,
-	0x00, 0x00, 0x38, 0x44, 0x44, 0x3c, 0x04, 0x38,
-	0x00, 0x00, 0x38, 0x04, 0x3c, 0x44, 0x3c, 0x00,
-	0x40, 0x40, 0x78, 0x44, 0x44, 0x44, 0x78, 0x00,
-	0x02, 0x02, 0x38, 0x40, 0x40, 0x40, 0x38, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00,
-	0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x66, 0x66, 0xff, 0x66, 0xff, 0x66, 0x66, 0x00,
-	0x30, 0x7c, 0xc0, 0x78, 0x0c, 0xf8, 0x30, 0x00,
-	0xc4, 0xcc, 0x18, 0x30, 0x60, 0xcc, 0x8c, 0x00,
-	0x78, 0xcc, 0x78, 0x70, 0xce, 0xcc, 0x7e, 0x00,
-	0x60, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x30, 0x60, 0xc0, 0xc0, 0xc0, 0x60, 0x30, 0x00,
-	0xc0, 0x60, 0x30, 0x30, 0x30, 0x60, 0xc0, 0x00,
-	0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x00,
-	0x66, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0xc0,
-	0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00,
-	0x66, 0x66, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00,
-	0x60, 0xe0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-	0x78, 0xcc, 0x0c, 0x18, 0x60, 0xc0, 0xfc, 0x00,
-	0x78, 0xcc, 0x0c, 0x38, 0x0c, 0xcc, 0x78, 0x00,
-	0x0c, 0x1c, 0x2c, 0x4c, 0xfe, 0x0c, 0x0c, 0x00,
-	0xfc, 0xc0, 0xf8, 0x0c, 0x0c, 0xcc, 0x78, 0x00,
-	0x78, 0xcc, 0xc0, 0xf8, 0xcc, 0xcc, 0x78, 0x00,
-	0xfc, 0xcc, 0x18, 0x30, 0x30, 0x30, 0x30, 0x00,
-	0x78, 0xcc, 0xcc, 0x78, 0xcc, 0xcc, 0x78, 0x00,
-	0x78, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00,
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00,
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0xc0,
-	0x7c, 0xfe, 0xfc, 0x80, 0x80, 0x80, 0x80, 0x80,
-	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x3f, 0x61, 0xcc, 0xd0, 0xd0, 0xcc, 0x61, 0x3f,
-	0x78, 0xcc, 0x0c, 0x18, 0x30, 0x00, 0x30, 0x00,
-	0x00, 0x00, 0x00, 0xf8, 0xf8, 0x00, 0x00, 0x00,
-	0x30, 0x78, 0xcc, 0xfc, 0xcc, 0xcc, 0xcc, 0x00,
-	0xf8, 0xcc, 0xcc, 0xf8, 0xcc, 0xcc, 0xf8, 0x00,
-	0x78, 0xcc, 0xc0, 0xc0, 0xc0, 0xcc, 0x78, 0x00,
-	0xf0, 0xd8, 0xcc, 0xcc, 0xcc, 0xd8, 0xf0, 0x00,
-	0xfc, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xfc, 0x00,
-	0xfc, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xc0, 0x00,
-	0x78, 0xcc, 0xc0, 0xdc, 0xcc, 0xcc, 0x78, 0x00,
-	0xcc, 0xcc, 0xcc, 0xfc, 0xcc, 0xcc, 0xcc, 0x00,
-	0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00,
-	0x18, 0x18, 0x18, 0x18, 0x18, 0xd8, 0x70, 0x00,
-	0xcc, 0xd8, 0xf0, 0xe0, 0xf0, 0xd8, 0xcc, 0x00,
-	0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0x00,
-	0xc6, 0xee, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0x00,
-	0xcc, 0xec, 0xfc, 0xfc, 0xdc, 0xcc, 0xcc, 0x00,
-	0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00,
-	0xf8, 0xcc, 0xcc, 0xf8, 0xc0, 0xc0, 0xc0, 0x00,
-	0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x0c,
-	0xf8, 0xcc, 0xcc, 0xf8, 0xf0, 0xd8, 0xcc, 0x00,
-	0x78, 0xcc, 0xc0, 0x78, 0x0c, 0xcc, 0x78, 0x00,
-	0xfc, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x00,
-	0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00,
-	0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x30, 0x00,
-	0xc6, 0xc6, 0xc6, 0xd6, 0xfe, 0xee, 0xc6, 0x00,
-	0xcc, 0xcc, 0x78, 0x30, 0x78, 0xcc, 0xcc, 0x00,
-	0xcc, 0xcc, 0xcc, 0x78, 0x30, 0x30, 0x30, 0x00,
-	0xfc, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xfc, 0x00,
-	0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x00,
-	0xcc, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0x7c, 0x00,
-	0xe8, 0x4d, 0x4a, 0x48, 0x00, 0x00, 0x00, 0x00,
-	0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00,
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0xfe,
-	0xfe, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0x7c, 0x00,
-	0xc0, 0xc0, 0xf8, 0xcc, 0xcc, 0xcc, 0xf8, 0x00,
-	0x00, 0x00, 0x78, 0xc0, 0xc0, 0xc0, 0x78, 0x00,
-	0x0c, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x7c, 0x00,
-	0x00, 0x00, 0x78, 0xcc, 0xfc, 0xc0, 0x78, 0x00,
-	0x38, 0x60, 0xf8, 0x60, 0x60, 0x60, 0x60, 0x00,
-	0x00, 0x00, 0x78, 0xcc, 0xcc, 0x7c, 0x0c, 0x78,
-	0xc0, 0xc0, 0xf8, 0xcc, 0xcc, 0xcc, 0xcc, 0x00,
-	0xc0, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00,
-	0x30, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xe0,
-	0xc0, 0xc0, 0xcc, 0xd8, 0xf0, 0xd8, 0xcc, 0x00,
-	0xe0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-	0x00, 0x00, 0xcc, 0xfe, 0xfe, 0xd6, 0xc6, 0x00,
-	0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xcc, 0xcc, 0x00,
-	0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0x78, 0x00,
-	0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xf8, 0xc0, 0xc0,
-	0x00, 0x00, 0x7c, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c,
-	0x00, 0x00, 0xf8, 0xcc, 0xc0, 0xc0, 0xc0, 0x00,
-	0x00, 0x00, 0x7c, 0xc0, 0x78, 0x0c, 0xf8, 0x00,
-	0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x1c, 0x00,
-	0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x00,
-	0x00, 0x00, 0xcc, 0xcc, 0xcc, 0x78, 0x30, 0x00,
-	0x00, 0x00, 0xc6, 0xd6, 0xfe, 0x7c, 0x6c, 0x00,
-	0x00, 0x00, 0xcc, 0x78, 0x30, 0x78, 0xcc, 0x00,
-	0x00, 0x00, 0xcc, 0xcc, 0xcc, 0x7c, 0x18, 0x70,
-	0x00, 0x00, 0xfc, 0x18, 0x30, 0x60, 0xfc, 0x00,
-	0xcc, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0x78, 0x00,
-	0xcc, 0x30, 0x78, 0xcc, 0xfc, 0xcc, 0xcc, 0x00,
-	0x84, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00,
-	0x38, 0x6c, 0x6c, 0xf8, 0xcc, 0xcc, 0xf8, 0x80,
-	0x08, 0x0c, 0x0e, 0xff, 0xff, 0x0e, 0x0c, 0x08,
-	0x0e
+	0x01, 0x03, 0x06, 0x0c, 0x18, 0x3e, 0x03, 0x00, 
+	0x80, 0xc0, 0x60, 0x30, 0x18, 0x7c, 0xc0, 0x00, 
+	0x00, 0x03, 0x3e, 0x18, 0x0c, 0x06, 0x03, 0x01, 
+	0x00, 0xc0, 0x7c, 0x18, 0x30, 0x60, 0xc0, 0x80, 
+	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
+	0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x7f, 
+	0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 
+	0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 
+	0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18, 
+	0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x18, 
+	0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 
+	0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x18, 
+	0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0x18, 
+	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x00, 0x00, 0x00, 
+	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x18, 0x18, 
+	0x00, 0x00, 0x00, 0xc0, 0xe0, 0x30, 0x18, 0x18, 
+	0x18, 0x18, 0x30, 0xe0, 0xc0, 0x00, 0x00, 0x00, 
+	0x18, 0x18, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 
+	0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x18, 
+	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18, 
+	0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x18, 0x18, 
+	0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
+	0x18, 0x3c, 0x66, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 
+	0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x3c, 0x18, 
+	0x18, 0x66, 0xc3, 0xdb, 0xdb, 0xc3, 0x66, 0x18, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x18, 0x00, 
+	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x66, 0x66, 0xff, 0x66, 0xff, 0x66, 0x66, 0x00, 
+	0x18, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x18, 0x00, 
+	0x62, 0x66, 0x0c, 0x18, 0x30, 0x66, 0x46, 0x00, 
+	0x3c, 0x66, 0x3c, 0x38, 0x67, 0x66, 0x3f, 0x00, 
+	0x30, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x0c, 0x18, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00, 
+	0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00, 
+	0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00, 
+	0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 
+	0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 
+	0x00, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00, 
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
+	0x18, 0x18, 0x38, 0x18, 0x18, 0x18, 0x7e, 0x00, 
+	0x3c, 0x66, 0x06, 0x0c, 0x30, 0x60, 0x7e, 0x00, 
+	0x3c, 0x66, 0x06, 0x1c, 0x06, 0x66, 0x3c, 0x00, 
+	0x06, 0x0e, 0x1e, 0x66, 0x7f, 0x06, 0x06, 0x00, 
+	0x7e, 0x60, 0x7c, 0x06, 0x06, 0x66, 0x3c, 0x00, 
+	0x3c, 0x66, 0x60, 0x7c, 0x66, 0x66, 0x3c, 0x00, 
+	0x7e, 0x66, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x00, 
+	0x3c, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x3c, 0x00, 
+	0x3c, 0x66, 0x66, 0x3e, 0x06, 0x66, 0x3c, 0x00, 
+	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 
+	0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30, 
+	0x0e, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0e, 0x00, 
+	0x7c, 0x82, 0xba, 0xa2, 0xa2, 0xba, 0x82, 0x7c, 
+	0x70, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x70, 0x00, 
+	0x3c, 0x66, 0x06, 0x0c, 0x18, 0x00, 0x18, 0x00, 
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
+	0x18, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00, 
+	0x7c, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x7c, 0x00, 
+	0x3c, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x00, 
+	0x78, 0x6c, 0x66, 0x66, 0x66, 0x6c, 0x78, 0x00, 
+	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x7e, 0x00, 
+	0x7e, 0x60, 0x60, 0x78, 0x60, 0x60, 0x60, 0x00, 
+	0x3c, 0x66, 0x60, 0x6e, 0x66, 0x66, 0x3c, 0x00, 
+	0x66, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00, 
+	0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 
+	0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x6c, 0x38, 0x00, 
+	0x66, 0x6c, 0x78, 0x70, 0x78, 0x6c, 0x66, 0x00, 
+	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7e, 0x00, 
+	0x63, 0x77, 0x7f, 0x6b, 0x63, 0x63, 0x63, 0x00, 
+	0x66, 0x76, 0x7e, 0x7e, 0x6e, 0x66, 0x66, 0x00, 
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
+	0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x00, 
+	0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x0e, 0x00, 
+	0x7c, 0x66, 0x66, 0x7c, 0x78, 0x6c, 0x66, 0x00, 
+	0x3c, 0x66, 0x60, 0x3c, 0x06, 0x66, 0x3c, 0x00, 
+	0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
+	0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 
+	0x63, 0x63, 0x63, 0x6b, 0x7f, 0x77, 0x63, 0x00, 
+	0x66, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x66, 0x00, 
+	0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x00, 
+	0x7e, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x7e, 0x00, 
+	0x66, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 
+	0x66, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 
+	0x66, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0x00, 
+	0x00, 0x10, 0x30, 0x7f, 0x7f, 0x30, 0x10, 0x00, 
+	0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 
+	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00, 
+	0x00, 0x00, 0x3c, 0x60, 0x60, 0x60, 0x3c, 0x00, 
+	0x00, 0x06, 0x06, 0x3e, 0x66, 0x66, 0x3e, 0x00, 
+	0x00, 0x00, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 
+	0x00, 0x0e, 0x18, 0x3e, 0x18, 0x18, 0x18, 0x00, 
+	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x7c, 
+	0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x00, 
+	0x00, 0x18, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x00, 
+	0x00, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x3c, 
+	0x00, 0x60, 0x60, 0x6c, 0x78, 0x6c, 0x66, 0x00, 
+	0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 
+	0x00, 0x00, 0x66, 0x7f, 0x7f, 0x6b, 0x63, 0x00, 
+	0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x00, 
+	0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00, 
+	0x00, 0x00, 0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 
+	0x00, 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x06, 
+	0x00, 0x00, 0x7c, 0x66, 0x60, 0x60, 0x60, 0x00, 
+	0x00, 0x00, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x00, 
+	0x00, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x0e, 0x00, 
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 
+	0x00, 0x00, 0x63, 0x6b, 0x7f, 0x3e, 0x36, 0x00, 
+	0x00, 0x00, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x00, 
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x3e, 0x0c, 0x78, 
+	0x00, 0x00, 0x7e, 0x0c, 0x18, 0x30, 0x7e, 0x00, 
+	0x66, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00, 
+	0x66, 0x18, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x00, 
+	0x42, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 
+	0x1c, 0x36, 0x36, 0x7c, 0x66, 0x66, 0x7c, 0x40, 
+	0x08, 0x0c, 0x0e, 0xff, 0xff, 0x0e, 0x0c, 0x08
 };
 
 void CharsetRendererV2::setCurID(byte id) {
-	_nbChars = charsetDataV2[6];
-	_widthTable = charsetDataV2 + 8;
-	_fontPtr = charsetDataV2 + 8 + _nbChars;
+	_fontPtr = charsetDataV2;
+
+#if 0
+	// Decompress weird encoding in which the Zak executable contains the font.
+	// I leave the code around in case we need to use it again (e.g. we might
+	// have to include different fonts for french/spanish/russian/... version
+	// of MM / Zak
+	//
+	int count = 0, len;
+	byte b;
+	for (int offset = 0; offset < (int)sizeof(charsetDataV2); offset++) {
+		if (charsetDataV2[offset+1] == 0x00 && charsetDataV2[offset+2] == 0xB2) {
+			b = charsetDataV2[offset+3];
+			len = charsetDataV2[offset+4];
+			while (len--) {
+				printf("0x%02x, ", b);
+				count++;
+				if (count % 8 == 0)
+					printf("\n");
+			}
+			offset += 6;
+		} else {
+			printf("0x%02x, ", charsetDataV2[offset]);
+			count++;
+			if (count % 8 == 0)
+				printf("\n");
+		}
+	}
+	printf("\n");
+#endif
 }
 
 int CharsetRendererV3::getCharWidth(byte chr) {