Fix bug #1811732: "MANIAC C64: German version not supported"

svn-id: r30119

1 files changed, 136 insertions, 1 deletions

diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 6c1e556448..f2864e4c1e 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -762,6 +762,138 @@ static const byte germanCharsetDataV2[] = {
 	0x08, 0x0c, 0x0e, 0xff, 0xff, 0x0e, 0x0c, 0x08,
 };
 
+// German C64 MM
+static const byte germanCharsetDataV0[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	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,
+	0x66, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x49, 0x00,
+	0x3c, 0x66, 0x3c, 0x38, 0x67, 0x66, 0x3f, 0x00,
+	0x06, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x0c, 0x18, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00,
+	0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00,
+	0x3c, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x6c, 0x60,
+	0x66, 0x3c, 0x66, 0x7e, 0x66, 0x66, 0x66, 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,
+	0x66, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00,
+	0x7c, 0x82, 0xba, 0xa2, 0xba, 0x82, 0x7c, 0x00,
+	0x66, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 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, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00,
+	0x0c, 0x12, 0x30, 0x7c, 0x30, 0x62, 0xfc, 0x00,
+	0x66, 0x24, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00,
+	0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x18,
+	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,
+	0x01, 0x03, 0x06, 0x6c, 0x78, 0x70, 0x60, 0x00,
+	0x18, 0x3c, 0x7e, 0xff, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0xff, 0x7e, 0x3c, 0x18,
+	0x10, 0x30, 0x70, 0xff, 0xff, 0x70, 0x30, 0x10,
+	0x08, 0x0c, 0x0e, 0xff, 0xff, 0x0e, 0x0c, 0x08,
+};
+
 // French Zak font.
 static const byte frenchCharsetDataV2[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1411,7 +1543,10 @@ CharsetRendererV2::CharsetRendererV2(ScummEngine *vm, Common::Language language)
 
 	switch (language) {
 	case Common::DE_DEU:
-		_fontPtr = germanCharsetDataV2;
+		if (_vm->_game.version == 0)
+			_fontPtr = germanCharsetDataV0;
+		else
+			_fontPtr = germanCharsetDataV2;
 		break;
 	case Common::FR_FRA:
 		_fontPtr = frenchCharsetDataV2;