[Scummvm-cvs-logs] CVS: scummvm/scumm resource_v2.cpp,1.18,1.19 scumm.h,1.235,1.236 scummvm.cpp,2.203,2.204

[Pawel Kolodziejski]

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

Modified Files:
	resource_v2.cpp scumm.h scummvm.cpp 
Log Message:
more v1 load directory ...

Index: resource_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- resource_v2.cpp	2 Jun 2003 17:32:13 -0000	1.18
+++ resource_v2.cpp	2 Jun 2003 18:15:07 -0000	1.19
@@ -25,13 +25,15 @@
 #include "resource.h"
 
 void Scumm_v2::readClassicIndexFile() {
-	if (_gameId == GID_MANIAC) {
+	int i;
+
+	if (_gameId == GID_MANIAC64) {
 		_numGlobalObjects = 800;
 		_numRooms = 55;
 		_numCostumes = 35;
 		_numScripts = 200;
 		_numSounds = 100;
-	} else if (_gameId == GID_ZAK) {
+	} else if (_gameId == GID_ZAK64) {
 		_numGlobalObjects = 775;
 		_numRooms = 61;
 		_numCostumes = 37;
@@ -51,15 +53,43 @@
 	_palManipIntermediatePal = 0; // Will allocate when needed
 
 	_fileHandle.readUint16LE(); /* version magic number */
-	for (int i = 0; i != _numGlobalObjects; i++) {
+	for (i = 0; i != _numGlobalObjects; i++) {
 		byte tmp = _fileHandle.readByte();
 		_objectOwnerTable[i] = tmp & OF_OWNER_MASK;
 		_objectStateTable[i] = tmp >> OF_STATE_SHL;
 	}
-	readResTypeList(rtRoom, MKID('ROOM'), "room");
-	readResTypeList(rtCostume, MKID('COST'), "costume");
-	readResTypeList(rtScript, MKID('SCRP'), "script");
-	readResTypeList(rtSound, MKID('SOUN'), "sound");
+
+	for (i = 0; i < _numRooms; i++) {
+		res.roomno[rtRoom][i] = i;
+		_fileHandle.seek(_numRooms, SEEK_CUR);
+	}
+
+	for (i = 0; i < _numCostumes; i++) {
+		res.roomno[rtCostume][i] = _fileHandle.readByte();
+	}
+	for (i = 0; i < _numCostumes; i++) {
+		res.roomoffs[rtCostume][i] = _fileHandle.readUint16LE();
+		if (res.roomoffs[rtCostume][i] == 0xFFFF)
+			res.roomoffs[rtCostume][i] = 0xFFFFFFFF;
+	}
+
+	for (i = 0; i < _numScripts; i++) {
+		res.roomno[rtScript][i] = _fileHandle.readByte();
+	}
+	for (i = 0; i < _numScripts; i++) {
+		res.roomoffs[rtScript][i] = _fileHandle.readUint16LE();
+		if (res.roomoffs[rtScript][i] == 0xFFFF)
+			res.roomoffs[rtScript][i] = 0xFFFFFFFF;
+	}
+
+	for (i = 0; i < _numSounds; i++) {
+		res.roomno[rtSound][i] = _fileHandle.readByte();
+	}
+	for (i = 0; i < _numSounds; i++) {
+		res.roomoffs[rtSound][i] = _fileHandle.readUint16LE();
+		if (res.roomoffs[rtSound][i] == 0xFFFF)
+			res.roomoffs[rtSound][i] = 0xFFFFFFFF;
+	}
 }
 
 void Scumm_v2::readEnhancedIndexFile() {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- scumm.h	2 Jun 2003 02:25:23 -0000	1.235
+++ scumm.h	2 Jun 2003 18:15:08 -0000	1.236
@@ -181,8 +181,8 @@
 	GID_CMI,
 	GID_MANIAC,
 	GID_ZAK,
-	//GID_MANIAC64,
-	//GID_ZAK64,
+	GID_MANIAC64,
+	GID_ZAK64,
 	GID_PUTTDEMO
 };
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.203
retrieving revision 2.204
diff -u -d -r2.203 -r2.204
--- scummvm.cpp	2 Jun 2003 11:33:48 -0000	2.203
+++ scummvm.cpp	2 Jun 2003 18:15:09 -0000	2.204
@@ -61,8 +61,10 @@
 
 static const VersionSettings scumm_settings[] = {
 	/* Scumm Version 1 */
-//	{"maniac64",      "Maniac Mansion (C64)",                          GID_MANIAC64, 1, 0, 0,},
-//	{"zak64",         "Zak McKracken and the Alien Mindbenders (C64)", GID_ZAK64, 1, 0, 0,},
+	{"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,