[Scummvm-cvs-logs] SF.net SVN: scummvm:[48173] scummvm/trunk/engines/agos/charset-fontdata.cpp

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Sun Mar 7 10:22:20 CET 2010


Revision: 48173
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48173&view=rev
Author:   Kirben
Date:     2010-03-07 09:22:19 +0000 (Sun, 07 Mar 2010)

Log Message:
-----------
Add font data for Polish Windows 4CD version of The Feeble Files.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/charset-fontdata.cpp

Modified: scummvm/trunk/engines/agos/charset-fontdata.cpp
===================================================================
--- scummvm/trunk/engines/agos/charset-fontdata.cpp	2010-03-07 05:06:58 UTC (rev 48172)
+++ scummvm/trunk/engines/agos/charset-fontdata.cpp	2010-03-07 09:22:19 UTC (rev 48173)
@@ -34,7 +34,17 @@
 
 namespace AGOS {
 
-static const byte polish_feebleFontSize[208] = {
+static const byte polish4CD_feebleFontSize[98] = {
+	8, 2, 5, 8, 8, 8, 8, 2, 4, 4, 8, 8, 3, 8, 2, 9,
+	8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 2, 3, 8, 8, 8, 8,
+	7, 8, 8, 8, 8, 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8,
+	8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3, 9,
+	4, 8, 8, 8, 8, 8, 7, 8, 8, 4, 5, 7, 3, 8, 8, 8,
+	8, 8, 8, 7, 7, 8, 8, 8, 8, 8, 8, 5, 2, 5, 8, 8,
+	8, 8,
+};
+
+static const byte polish2CD_feebleFontSize[208] = {
 	4, 2, 8, 8, 8, 8, 8, 2, 4, 4, 8, 8, 3, 8, 2, 9,
 	8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 2, 8, 8, 8, 8, 8,
 	7, 8, 8, 8, 8, 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8,
@@ -67,17 +77,219 @@
 };
 
 uint AGOSEngine::getFeebleFontSize(byte chr) {
-	if (getGameType() == GType_FF && (getFeatures() & GF_DEMO) && chr == 32)
+	if (getGameType() == GType_FF && (getFeatures() & GF_DEMO) && chr == 32) {
 		return 4;
-	else if (_language == Common::PL_POL)
-		return polish_feebleFontSize[chr - 32];
-	else
+	} else if (_language == Common::PL_POL) {
+		if (!strcmp(getExtra(), "4CD"))
+			return polish4CD_feebleFontSize[chr - 32];
+		else
+			return polish2CD_feebleFontSize[chr - 32];
+	} else {
 		return feebleFontSize[chr - 32];
+	}
 }
 
-static const byte polish_feeble_windowFont[] = {
+static const byte polish4CD_feeble_windowFont[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
+	0x90, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x3e, 0x42, 0x82, 0x82, 0x82, 0x86, 0x7a, 0x02, 0x04, 0x04,
+	0x08, 0x10, 0x10, 0x7c, 0x82, 0x80, 0x80, 0x80, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0x3e, 0x62, 0x92, 0x64, 0x08, 0x10, 0x20, 0x4c, 0x92, 0x8c, 0x00, 0x00, 0x00,
+	0x00, 0x70, 0x88, 0x88, 0x50, 0x20, 0x52, 0x8a, 0x84, 0x7a, 0x00, 0x00, 0x00,
+	0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00,
+	0x80, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00,
+	0x10, 0x92, 0x54, 0x38, 0x38, 0x54, 0x92, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x10, 0xfe, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x80, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00,
+	0x78, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00,
+	0x10, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00,
+	0x78, 0x84, 0x84, 0x04, 0x04, 0x08, 0x10, 0x20, 0x40, 0xfc, 0x00, 0x00, 0x00,
+	0x7c, 0x82, 0x82, 0x02, 0x02, 0x1c, 0x02, 0x02, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0x04, 0x0c, 0x14, 0x24, 0x44, 0x84, 0xfe, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00,
+	0xfe, 0x80, 0x80, 0xfc, 0x02, 0x02, 0x02, 0x02, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0x3e, 0x40, 0x80, 0xfc, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0xfe, 0x02, 0x02, 0x02, 0x02, 0x04, 0x08, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00,
+	0x78, 0x84, 0x84, 0x84, 0x78, 0x84, 0x84, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00,
+	0x7c, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7e, 0x02, 0x02, 0x7c, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x80, 0x00,
+	0x04, 0x08, 0x08, 0x9c, 0xa2, 0xc2, 0x82, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x08, 0x10, 0x10, 0x7c, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0x3c, 0x42, 0x82, 0x02, 0x04, 0x08, 0x10, 0x10, 0x00, 0x10, 0x10, 0x00, 0x00,
+	0x08, 0x10, 0x10, 0x7c, 0x80, 0x80, 0x78, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00,
+	0x7c, 0x82, 0x82, 0x82, 0x82, 0xfe, 0x82, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00,
+	0xfc, 0x82, 0x82, 0x82, 0xfc, 0x82, 0x82, 0x82, 0x82, 0xfc, 0x00, 0x00, 0x00,
+	0x7c, 0x82, 0x82, 0x80, 0x80, 0x80, 0x80, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0xfc, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0xfc, 0x00, 0x00, 0x00,
+	0xfe, 0x80, 0x80, 0x80, 0x80, 0xfc, 0x80, 0x80, 0x80, 0xfe, 0x00, 0x00, 0x00,
+	0xfe, 0x80, 0x80, 0x80, 0x80, 0xfc, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
+	0x7c, 0x82, 0x82, 0x80, 0x80, 0x86, 0x82, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0xfe, 0x82, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00,
+	0xe0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0xe0, 0x00, 0x00, 0x00,
+	0x1e, 0x02, 0x02, 0x02, 0x02, 0x02, 0x82, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0x82, 0x82, 0x84, 0x88, 0x90, 0xe0, 0x90, 0x88, 0x84, 0x82, 0x00, 0x00, 0x00,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xfe, 0x00, 0x00, 0x00,
+	0x82, 0xc6, 0xaa, 0x92, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00,
+	0x82, 0x82, 0xc2, 0xa2, 0x92, 0x8a, 0x86, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00,
+	0x7c, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0xfc, 0x82, 0x82, 0x82, 0x82, 0xfc, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
+	0x7c, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7e, 0x02, 0x02, 0x00,
+	0xfc, 0x82, 0x82, 0x82, 0x82, 0xfc, 0x82, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00,
+	0x7c, 0x82, 0x80, 0x80, 0x7c, 0x02, 0x02, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0xfe, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x92, 0xaa, 0xc6, 0x00, 0x00, 0x00,
+	0x82, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10, 0x28, 0x44, 0x82, 0x00, 0x00, 0x00,
+	0x82, 0x82, 0x82, 0x82, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00,
+	0xfe, 0x02, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0xfe, 0x00, 0x00, 0x00,
+	0x00, 0x10, 0x00, 0xfe, 0x04, 0x08, 0x10, 0x20, 0x40, 0xfe, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x7c, 0x82, 0x82, 0xfe, 0x80, 0x80, 0x7e, 0x04, 0x04, 0x08,
+	0x08, 0x10, 0x10, 0xfe, 0x04, 0x08, 0x10, 0x20, 0x40, 0xfe, 0x00, 0x00, 0x00,
+	0xc0, 0x40, 0x40, 0x60, 0x40, 0xc0, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x3e, 0x42, 0x82, 0x82, 0x82, 0x86, 0x7a, 0x00, 0x00, 0x00,
+	0x80, 0x80, 0x80, 0xfc, 0x82, 0x82, 0x82, 0x82, 0x82, 0xfc, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x7c, 0x82, 0x80, 0x80, 0x80, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0x02, 0x02, 0x02, 0x7e, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7e, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x7c, 0x82, 0x82, 0xfe, 0x80, 0x80, 0x7e, 0x00, 0x00, 0x00,
+	0x1c, 0x20, 0x20, 0xf8, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x3e, 0x42, 0x82, 0x82, 0x82, 0x82, 0x7e, 0x02, 0x02, 0x7c,
+	0x80, 0x80, 0x80, 0xfc, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00,
+	0x40, 0x00, 0x00, 0x40, 0xc0, 0x40, 0x40, 0x40, 0x40, 0xe0, 0x00, 0x00, 0x00,
+	0x10, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xe0,
+	0x80, 0x80, 0x80, 0x84, 0x88, 0x90, 0xe0, 0x90, 0x88, 0x84, 0x00, 0x00, 0x00,
+	0xc0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xfc, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x9c, 0xa2, 0xc2, 0x82, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x7c, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xfc, 0x82, 0x82, 0x82, 0x82, 0x82, 0xfc, 0x80, 0x80, 0x80,
+	0x00, 0x00, 0x00, 0x7e, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7e, 0x02, 0x02, 0x02,
+	0x00, 0x00, 0x00, 0x9c, 0xa2, 0xc2, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x7c, 0x80, 0x80, 0x78, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00,
+	0x20, 0x20, 0x20, 0xf8, 0x20, 0x20, 0x20, 0x20, 0x20, 0x1c, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7e, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x82, 0x82, 0x82, 0x82, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x7c, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x82, 0x44, 0x28, 0x10, 0x28, 0x44, 0x82, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7e, 0x02, 0x02, 0x7c,
+	0x00, 0x00, 0x00, 0xfe, 0x04, 0x08, 0x10, 0x20, 0x40, 0xfe, 0x00, 0x00, 0x00,
+	0x30, 0x40, 0x40, 0x40, 0x40, 0x80, 0x40, 0x40, 0x40, 0x40, 0x30, 0x00, 0x00,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00,
+	0xc0, 0x20, 0x20, 0x20, 0x20, 0x10, 0x20, 0x20, 0x20, 0x20, 0xc0, 0x00, 0x00,
+	0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0xc8,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x88, 0x00, 0x11, 0x00, 0x00, 0x00,
+	0x03, 0x00, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0xc8, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x14, 0x00, 0x86, 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, 0x03, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x88, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x88, 0x00, 0x11, 0x00, 0x00, 0x00, 0x03,
+	0x00, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0xc8, 0x00, 0x03, 0x00,
+	0x02, 0x00, 0x0e, 0x00, 0x81, 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, 0x03, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x88, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x03, 0x00, 0x88, 0x00, 0x11, 0x00, 0x00, 0x00, 0x03, 0x00,
+	0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0xc8, 0x00, 0x03, 0x00, 0x03,
+	0x00, 0x0e, 0x00, 0x7f, 0x00, 0x45, 0x46, 0x46, 0x45, 0x43, 0x54, 0x53, 0x00,
+	0x53, 0x49, 0x4d, 0x4f, 0x4e, 0x00, 0x00, 0x00, 0xa8, 0x4d, 0xee, 0x00, 0xb0,
+	0x4d, 0xee, 0x00, 0x00, 0x53, 0x49, 0x4d, 0x4f, 0x4e, 0x32, 0x00, 0xc0, 0x4d,
+	0xee, 0x00, 0xc1, 0x4d, 0xee, 0x00, 0x4d, 0x55, 0x53, 0x49, 0x43, 0x00, 0x00,
+	0x00, 0xc0, 0x4d, 0xee, 0x00, 0xd0, 0x4d, 0xee, 0x00, 0x44, 0x72, 0x81, 0x63,
+	0x6b, 0x65, 0x6e, 0x20, 0x53, 0x69, 0x65, 0x20, 0x64, 0x69, 0x65, 0x20, 0x3c,
+	0x4c, 0x65, 0x65, 0x72, 0x74, 0x61, 0x73, 0x74, 0x65, 0x3e, 0x2c, 0x20, 0x75,
+	0x6d, 0x20, 0x66, 0x6f, 0x72, 0x74, 0x7a, 0x75, 0x66, 0x61, 0x68, 0x72, 0x65,
+	0x6e, 0x2e, 0x2e, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73, 0x20, 0x3c, 0x53,
+	0x50, 0x41, 0x43, 0x45, 0x3e, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x6f, 0x6e, 0x74,
+	0x69, 0x6e, 0x75, 0x65, 0x2e, 0x2e, 0x2e, 0x00, 0x65, 0x6e, 0x67, 0x69, 0x6e,
+	0x65, 0x73, 0x2f, 0x61, 0x67, 0x6f, 0x73, 0x2f, 0x66, 0x65, 0x65, 0x62, 0x6c,
+	0x65, 0x2e, 0x63, 0x70, 0x70, 0x00, 0x5f, 0x6d, 0x6f, 0x76, 0x69, 0x65, 0x50,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x00, 0x77, 0x6f, 0x62, 0x62, 0x6c, 0x65, 0x25,
+	0x64, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x63, 0x6c, 0x69, 0x70, 0x73, 0x69,
+	0x6e, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x63, 0x6c, 0x69, 0x70, 0x69, 0x6e,
+	0x32, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x67, 0x6f, 0x31, 0x2e, 0x73, 0x6d,
+	0x6b, 0x00, 0x6d, 0x61, 0x7a, 0x65, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x67,
+	0x6f, 0x32, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x69,
+	0x6e, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x67, 0x6f, 0x33, 0x2e, 0x73, 0x6d,
+	0x6b, 0x00, 0x70, 0x61, 0x64, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x67, 0x6f,
+	0x34, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x2e,
+	0x73, 0x6d, 0x6b, 0x00, 0x66, 0x67, 0x6f, 0x35, 0x2e, 0x73, 0x6d, 0x6b, 0x00,
+	0x70, 0x69, 0x6c, 0x6c, 0x64, 0x69, 0x65, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66,
+	0x67, 0x6f, 0x36, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x62, 0x69, 0x6b, 0x65, 0x62,
+	0x75, 0x73, 0x74, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x67, 0x6f, 0x37, 0x2e,
+	0x73, 0x6d, 0x6b, 0x00, 0x73, 0x74, 0x61, 0x74, 0x75, 0x65, 0x2e, 0x73, 0x6d,
+	0x6b, 0x00, 0x66, 0x67, 0x6f, 0x38, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x6a, 0x75,
+	0x6e, 0x6b, 0x6f, 0x75, 0x74, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x67, 0x6f,
+	0x39, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x68, 0x79, 0x70, 0x6e, 0x6f, 0x2e,
+	0x73, 0x6d, 0x6b, 0x00, 0x66, 0x62, 0x79, 0x65, 0x31, 0x2e, 0x73, 0x6d, 0x6b,
+	0x00, 0x66, 0x62, 0x79, 0x65, 0x32, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x6d, 0x6d,
+	0x66, 0x61, 0x64, 0x65, 0x69, 0x6e, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x6d, 0x61,
+	0x69, 0x6e, 0x6d, 0x65, 0x6e, 0x75, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x66,
+	0x61, 0x64, 0x65, 0x35, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x74, 0x65, 0x78,
+	0x74, 0x30, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x74, 0x65, 0x78, 0x74, 0x31,
+	0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x74, 0x65, 0x78, 0x74, 0x32, 0x2e, 0x73,
+	0x6d, 0x6b, 0x00, 0x66, 0x74, 0x65, 0x78, 0x74, 0x33, 0x2e, 0x73, 0x6d, 0x6b,
+	0x00, 0x66, 0x74, 0x65, 0x78, 0x74, 0x34, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66,
+	0x74, 0x65, 0x78, 0x74, 0x35, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x66, 0x61,
+	0x64, 0x65, 0x31, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x6d, 0x75, 0x73, 0x6f, 0x73,
+	0x70, 0x31, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x6e, 0x65, 0x77, 0x63, 0x72, 0x65,
+	0x64, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x61, 0x73, 0x61, 0x6c, 0x6c, 0x2e,
+	0x73, 0x6d, 0x6b, 0x00, 0x6d, 0x75, 0x73, 0x35, 0x70, 0x32, 0x2e, 0x73, 0x6d,
+	0x6b, 0x00, 0x63, 0x6f, 0x61, 0x63, 0x68, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x6f,
+	0x75, 0x74, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x66, 0x61,
+	0x64, 0x65, 0x33, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x69, 0x64, 0x66, 0x78, 0x34,
+	0x61, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x69, 0x64, 0x66, 0x78, 0x34, 0x62, 0x2e,
+	0x73, 0x6d, 0x6b, 0x00, 0x69, 0x64, 0x66, 0x78, 0x34, 0x63, 0x2e, 0x73, 0x6d,
+	0x6b, 0x00, 0x69, 0x64, 0x66, 0x78, 0x34, 0x64, 0x2e, 0x73, 0x6d, 0x6b, 0x00,
+	0x69, 0x64, 0x66, 0x78, 0x34, 0x65, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x69, 0x64,
+	0x66, 0x78, 0x34, 0x66, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x69, 0x64, 0x66, 0x78,
+	0x34, 0x67, 0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x66, 0x61, 0x64, 0x65, 0x32,
+	0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x33, 0x62,
+	0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x33, 0x61,
+	0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x33, 0x63,
+	0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x33, 0x67,
+	0x2e, 0x73, 0x6d, 0x6b, 0x00, 0x66, 0x66, 0x61, 0x64, 0x65, 0x34, 0x2e, 0x73,
+	0x6d, 0x6b, 0x00, 0x66, 0x66, 0x61, 0x64, 0x65, 0x36, 0x2e, 0x73, 0x6d, 0x6b,
+	0x00, 0x77, 0x69, 0x6e, 0x61, 0x73, 0x6f, 0x66, 0x74, 0x2e, 0x73, 0x6d, 0x6b,
+	0x00, 0x66, 0x62, 0x69, 0x67, 0x74, 0x61, 0x6c, 0x6b, 0x2e, 0x73, 0x6d, 0x6b,
+	0x00, 0x65, 0x70, 0x69, 0x63, 0x2e, 0x64, 0x78, 0x61, 0x00, 0x00, 0x56, 0x4f,
+	0x49, 0x43, 0x45, 0x53, 0x00, 0x00, 0x00, 0xc6, 0x50, 0xee, 0x00, 0xc7, 0x50,
+	0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x75, 0x74,
+	0x20, 0x6f, 0x66, 0x20, 0x69, 0x63, 0x6f, 0x6e, 0x20, 0x6d, 0x65, 0x6d, 0x6f,
+	0x72, 0x79, 0x00, 0x43, 0x61, 0x6e, 0x27, 0x74, 0x20, 0x6f, 0x70, 0x65, 0x6e,
+	0x20, 0x69, 0x63, 0x6f, 0x6e, 0x73, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x27,
+	0x25, 0x73, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x80, 0x00,
+	0x88, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, 0xd8,
+	0x00, 0x00, 0x04, 0x48, 0x00, 0x00, 0x00, 0x20, 0x89, 0x8e, 0x00, 0xa8, 0x86,
+	0x10, 0x04, 0x08, 0x21, 0x88, 0x00, 0x38, 0x50, 0x84, 0x00, 0x89, 0x49, 0x28,
+	0x04, 0x08, 0x52, 0x14, 0x00, 0x20, 0x20, 0x84, 0x00, 0x89, 0x48, 0x38, 0x04,
+	0x08, 0x53, 0x9c, 0x00, 0x20, 0x50, 0x84, 0x00, 0x89, 0x48, 0x20, 0x04, 0x48,
+	0x50, 0x90, 0x00, 0x3c, 0x89, 0xc3, 0x00, 0x88, 0x88, 0x18, 0x03, 0x86, 0x23,
+	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b,
+	0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x0a, 0x0b, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x03, 0x0d, 0x0a, 0x0b, 0x0a,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x03, 0x04, 0x03,
+	0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x03,
+};
+
+static const byte polish2CD_feeble_windowFont[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
 	0x7c, 0x82, 0x82, 0x82, 0x82, 0xfe, 0x82, 0x82, 0x82, 0x82, 0x0c, 0x08, 0x00,
 	0x00, 0x00, 0x00, 0x3e, 0x42, 0x82, 0x82, 0x82, 0x86, 0x7a, 0x04, 0x06, 0x00,
 	0x04, 0x08, 0x10, 0x7c, 0x82, 0x80, 0x80, 0x80, 0x82, 0x7c, 0x00, 0x00, 0x00,
@@ -2105,10 +2317,14 @@
 		h = 13;
 		w = getFeebleFontSize(chr);
 
-		if (_language == Common::PL_POL)
-			src = polish_feeble_windowFont + (chr - 32) * 13;
-		else
+		if (_language == Common::PL_POL) {
+			if (!strcmp(getExtra(), "4CD"))
+				src = polish4CD_feeble_windowFont + (chr - 32) * 13;
+			else
+				src = polish2CD_feeble_windowFont + (chr - 32) * 13;
+		} else {
 			src = feeble_windowFont + (chr - 32) * 13;
+		}
 	} else if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
 		dst = (byte *)screen->pixels;
 		dstPitch = screen->pitch;


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