[Scummvm-cvs-logs] CVS: scummvm/common engine.cpp,1.1,1.2 gameDetector.cpp,1.1.1.1,1.2

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory usw-pr-cvs1:/tmp/cvs-serv16261/common

Modified Files:
	engine.cpp gameDetector.cpp 
Log Message:
experimental support for the V2 resource format (patch #601560)

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- engine.cpp	21 Aug 2002 16:53:11 -0000	1.1
+++ engine.cpp	29 Aug 2002 16:57:43 -0000	1.2
@@ -85,7 +85,9 @@
 		engine = new SimonState(detector, syst);
 	} else {
 		// Some kind of Scumm game
-		if (detector->_features & GF_OLD256)
+		if (detector->_features & GF_OLD_BUNDLE)
+			engine = new Scumm_v2(detector, syst);
+		else if (detector->_features & GF_OLD256)
 			engine = new Scumm_v3(detector, syst);
 		else if (detector->_features & GF_SMALL_HEADER)	// this force loomCD as v4
 			engine = new Scumm_v4(detector, syst);

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gameDetector.cpp	21 Aug 2002 16:07:22 -0000	1.1.1.1
+++ gameDetector.cpp	29 Aug 2002 16:57:43 -0000	1.2
@@ -350,8 +350,12 @@
 //      {"zak",         "Zak McKracken and the Alien Mindbenders (C64)", GID_ZAK64, 1, 0, 0,},
 
 	/* Scumm Version 2 */
-//      {"maniac",      "Maniac Mansion", GID_MANIAC, 2, 0, 0,},
-//      {"zak",         "Zak McKracken and the Alien Mindbenders",      GID_ZAK,     2, 0, 0,},
+//      {"maniac",      "Maniac Mansion", GID_MANIAC, 2, 0, 0,
+//      GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE |
+//      GF_NO_SCALLING},
+//	{"zak",         "Zak McKracken and the Alien Mindbenders",      GID_ZAK,     2, 0, 0,
+//	 GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE |
+//	 GF_NO_SCALLING},
 //      {"indy3",       "Indiana Jones and the Last Crusade",           GID_INDY3,   2, 0, 0,},
 
 	/* Scumm Version 3 */