[Scummvm-cvs-logs] CVS: scummvm/scumm resource_v2.cpp,1.20,1.21 script_v2.cpp,2.132,2.133 scumm.h,1.243,1.244 scummvm.cpp,2.218,2.219

[James Brown]

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

Modified Files:
	resource_v2.cpp script_v2.cpp scumm.h scummvm.cpp 
Log Message:
Get rid of *64 targets, use 'maniac' and 'zak' autodetection for the AFTER_V1 flag instead.


Index: resource_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- resource_v2.cpp	4 Jun 2003 12:48:50 -0000	1.20
+++ resource_v2.cpp	6 Jun 2003 10:47:11 -0000	1.21
@@ -27,20 +27,18 @@
 void Scumm_v2::readClassicIndexFile() {
 	int i;
 
-	if (_gameId == GID_MANIAC64) {
+	if (_gameId == GID_MANIAC) {
 		_numGlobalObjects = 800;
 		_numRooms = 55;
 		_numCostumes = 35;
 		_numScripts = 200;
 		_numSounds = 100;
-	} else if (_gameId == GID_ZAK64) {
+	} else if (_gameId == GID_ZAK) {
 		_numGlobalObjects = 775;
 		_numRooms = 61;
 		_numCostumes = 37;
 		_numScripts = 155;
 		_numSounds = 120;
-	} else {
-		error("Scumm_v1::readEchancedIndexFile(). Unknown game variant.");
 	}
 
 	_fileHandle.seek(0, SEEK_SET);
@@ -148,6 +146,7 @@
 			break;
 		case 0x0A31:
 			warning("Classic V1 game detected");
+			setFeatures(_features | GF_AFTER_V1);
 			readClassicIndexFile();
 			break;
 		default:

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.132
retrieving revision 2.133
diff -u -d -r2.132 -r2.133
--- script_v2.cpp	4 Jun 2003 13:15:05 -0000	2.132
+++ script_v2.cpp	6 Jun 2003 10:47:11 -0000	2.133
@@ -1245,7 +1245,7 @@
 	_userPut = 1;
 	_cursor.state = 1;
 	
-	if (_gameId == GID_MANIAC || _gameId == GID_MANIAC64) {
+	if (_gameId == GID_MANIAC) {
 		camera._mode = (byte) vm.cutSceneData[3];
 		if (camera._mode == CM_FOLLOW_ACTOR) {
 			actorFollowCamera(VAR(VAR_EGO));

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- scumm.h	5 Jun 2003 17:22:14 -0000	1.243
+++ scumm.h	6 Jun 2003 10:47:12 -0000	1.244
@@ -182,8 +182,6 @@
 	GID_CMI,
 	GID_MANIAC,
 	GID_ZAK,
-	GID_MANIAC64,
-	GID_ZAK64,
 	GID_PUTTDEMO
 };
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.218
retrieving revision 2.219
diff -u -d -r2.218 -r2.219
--- scummvm.cpp	6 Jun 2003 05:27:45 -0000	2.218
+++ scummvm.cpp	6 Jun 2003 10:47:12 -0000	2.219
@@ -85,12 +85,8 @@
 
 static const VersionSettings scumm_settings[] = {
 	/* Scumm Version 1 */
-	{"maniac64",      "Maniac Mansion (C64)", GID_MANIAC64, 1, 0, 0,
-	 GF_AFTER_V1 | GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"},
-	{"zak64",         "Zak McKracken and the Alien Mindbenders (C64)", GID_ZAK64, 1, 0, 0,
-	 GF_AFTER_V1 | GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"},
-
 	/* Scumm Version 2 */
+
 	{"maniac", "Maniac Mansion", GID_MANIAC, 2, 0, 0,
 	 GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"},
 	{"zak",         "Zak McKracken and the Alien Mindbenders",      GID_ZAK,     2, 0, 0,
@@ -2440,7 +2436,7 @@
 		_numActors = 80;
 	else if ((_features & GF_AFTER_V7) || (_gameId == GID_SAMNMAX))
 		_numActors = 30;
-	else if (_gameId == GID_MANIAC || _gameId == GID_MANIAC64)
+	else if (_gameId == GID_MANIAC)
 		_numActors = 25;
 	else
 		_numActors = 13;