[Scummvm-cvs-logs] SF.net SVN: scummvm:[49247] scummvm/trunk/engines/sci/graphics/picture.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 49247
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49247&view=rev
Author:   m_kiewitz
Date:     2010-05-26 17:15:49 +0000 (Wed, 26 May 2010)

Log Message:
-----------
SCI: adding another workaround for picture 376 in sq4/cd (same issue like originally found in r49216)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/picture.cpp

Modified: scummvm/trunk/engines/sci/graphics/picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/picture.cpp	2010-05-26 16:30:10 UTC (rev 49246)
+++ scummvm/trunk/engines/sci/graphics/picture.cpp	2010-05-26 17:15:49 UTC (rev 49247)
@@ -533,10 +533,16 @@
 		case PIC_OP_SET_PATTERN:
 			if (_resourceType >= SCI_PICTURE_TYPE_SCI11) {
 				if (strcmp(g_sci->getGameID(), "sq4") == 0) {
-					// WORKAROUND: For SQ4 / picture 381 handle this like a terminator
+					// WORKAROUND: For SQ4 / for some pictures handle this like a terminator
 					//  This picture includes garbage data, first a set pattern w/o parameter and then short pattern
-					if (_resourceId == 381)
+					//  I guess that garbage is a left over from the sq4-floppy (sci1) to sq4-cd (sci1.1) conversion
+					switch (_resourceId) {
+					case 381:
+					case 376:
 						return;
+					default:
+						break;
+					}
 				}
 				error("pic-operation set pattern inside sci1.1+ vector data");
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.