[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.192,1.193 scummvm.cpp,2.605,2.606

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10814/scumm

Modified Files:
	resource.cpp scummvm.cpp 
Log Message:

Avoid duplicate targets


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- resource.cpp	2 Mar 2004 01:28:32 -0000	1.192
+++ resource.cpp	2 Mar 2004 06:04:38 -0000	1.193
@@ -80,7 +80,7 @@
 		}
 		if (!(_features & GF_SMALL_HEADER)) {
 
-			if (_features & GF_AFTER_HEV7) {
+			if ((_features & GF_HUMONGOUS) && (_features & GF_WINDOWS)) {
 				sprintf(buf, "%s.he%.1d", _gameName.c_str(), room == 0 ? 0 : 1);
 			} else if (_version >= 7) {
 				if (room > 0 && (_version == 8))
@@ -185,7 +185,7 @@
 	if (_features & GF_SMALL_NAMES)
 		return;
 
-	if (_features & GF_AFTER_HEV7) {
+	if ((_features & GF_HUMONGOUS) && (_features & GF_WINDOWS)) {
 		num = READ_LE_UINT16(_HEV7RoomOffsets);
 		ptr = _HEV7RoomOffsets + 2;
 		for (i = 0; i < num; i++) {
@@ -346,7 +346,7 @@
 					_objectStateTable[i] = _objectOwnerTable[i] >> OF_STATE_SHL;
 					_objectOwnerTable[i] &= OF_OWNER_MASK;
 				}
-				if (_features & GF_AFTER_HEV7) {
+				if ((_features & GF_HUMONGOUS) && (_features & GF_WINDOWS)) {
 					// _objectRoomTable
 					_fileHandle.seek(num * 4, SEEK_CUR);
 					//_fileHandle.read(_objectRoomTable, num * 4);
@@ -496,7 +496,7 @@
 		for (i = 0; i < num; i++) {
 			res.roomoffs[id][i] = _fileHandle.readUint32LE();
 		}
-		if (_features & GF_AFTER_HEV7) {
+		if ((_features & GF_HUMONGOUS) && (_features & GF_WINDOWS)) {
 			_fileHandle.seek(4 * num, SEEK_CUR); // FIXME what are these additional offsets
 		}
 	}

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.605
retrieving revision 2.606
diff -u -d -r2.605 -r2.606
--- scummvm.cpp	2 Mar 2004 04:05:40 -0000	2.605
+++ scummvm.cpp	2 Mar 2004 06:04:38 -0000	2.606
@@ -212,12 +212,6 @@
 	// Humongous Entertainment Scumm Version 7 
 	//{"catalog", "Humongous Interactive Catalog", GID_PUTTPUTT, 6, MDT_NONE,
 	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	{"puttwin", "Putt-Putt Joins The Parade (Windows)", GID_PUTTPUTT, 6, MDT_NONE,
-	GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, "puttputt"},
-	{"moonwin", "Putt-Putt Goes To The Moon (Windows)", GID_PUTTPUTT, 6, MDT_NONE,
-	GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, "puttmoon"},
-	{"fbearwin", "Fatty Bear's Birthday Surprise (Windows)", GID_PUTTPUTT, 6, MDT_NONE,
-	GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, "fbear"},
 	//{"farm", "Let's Explore the Farm with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
 	// GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 	//{"farmdemo", "Let's Explore the Farm with Buzzy (Demo)", GID_PUTTPUTT, 6, MDT_NONE,