[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.361,2.362

Travis Howell kirben at users.sourceforge.net
Sun Aug 31 23:12:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv10931/scumm

Modified Files:
	scummvm.cpp 
Log Message:

Minor cleanup of color cycle resource loading


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.361
retrieving revision 2.362
diff -u -d -r2.361 -r2.362
--- scummvm.cpp	30 Aug 2003 01:32:32 -0000	2.361
+++ scummvm.cpp	1 Sep 2003 06:11:41 -0000	2.362
@@ -2242,15 +2242,15 @@
 	}
 
 	// Color cycling
-	ptr = 0;
-	if (_features & GF_SMALL_HEADER) {
-		if (_gameId == GID_MONKEY_VGA)
+	if (_version >= 4) {
+		if (_features & GF_SMALL_HEADER)
 			ptr = findResourceSmall (MKID('CYCL'), roomptr);
-	} else if (!(_features & GF_OLD_BUNDLE)) {
-		ptr = findResourceData(MKID('CYCL'), roomptr);
+		else 
+			ptr = findResourceData(MKID('CYCL'), roomptr);
+		if (ptr) {
+			initCycl(ptr);
+		}
 	}
-	if (ptr)
-		initCycl(ptr);
 
 	// Transparent color
 	if (_features & GF_OLD_BUNDLE)





More information about the Scummvm-git-logs mailing list