[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.263,1.264 scumm.cpp,1.178,1.179 scumm.h,1.473,1.474

[Travis Howell]

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

Modified Files:
	resource.cpp scumm.cpp scumm.h 
Log Message:

Add extra index types.
Remove duplicate code.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -d -r1.263 -r1.264
--- resource.cpp	7 Sep 2004 13:23:25 -0000	1.263
+++ resource.cpp	8 Sep 2004 05:58:36 -0000	1.264
@@ -556,6 +556,7 @@
 			break;
 
 		case MKID('RNAM'):
+			// Names of rooms
 			_fileHandle.seek(itemsize - 8, SEEK_CUR);
 			debug(9, "found RNAM block, skipping");
 			break;
@@ -565,7 +566,6 @@
 			_fileHandle.seek(-2, SEEK_CUR);
 			_HEV7RoomOffsets = (byte *)calloc(2 + (i * 4), 1);
 			_fileHandle.read(_HEV7RoomOffsets, (2 + (i * 4)) );
-			debug(9, "found DLFL block, offsets read");
 			break;
 
 		case MKID('DIRM'):
@@ -583,12 +583,12 @@
 
 		case MKID('DISK'):
 			_fileHandle.seek(itemsize - 8, SEEK_CUR);
-			warning("DISK index block not yet handled, skipping");
+			debug(9, "DISK index block not yet handled, skipping");
 			break;
 
 		case MKID('INIB'):
 			_fileHandle.seek(itemsize - 8, SEEK_CUR);
-			warning("INIB index block not yet handled, skipping");
+			debug(9, "INIB index block not yet handled, skipping");
 			break;
 
 		case MKID('DIRI'):
@@ -602,14 +602,11 @@
 			_fileHandle.read(_audioNames, _numAudioNames * 9);
 			break;
 
+		case MKID('DIRR'):
 		case MKID('DROO'):
 			readResTypeList(rtRoom, MKID('ROOM'), "room");
 			break;
 
-		case MKID('DIRR'):
-			readResTypeList(rtRoom, MKID('RMDA'), "room");
-			break;
-
 		case MKID('DRSC'):					// FIXME: Verify
 			readResTypeList(rtRoomScripts, MKID('RMSC'), "room script");
 			break;
@@ -628,14 +625,11 @@
 			readMAXS(itemsize);
 			break;
 
+		case MKID('DIRN'):
 		case MKID('DSOU'):
 			readResTypeList(rtSound, MKID('SOUN'), "sound");
 			break;
 
-		case MKID('DIRN'):
-			readResTypeList(rtSound, MKID('DIRN'), "sound");
-			break;
-
 		case MKID('AARY'):
 			readArrayFromIndexFile();
 			break;
@@ -2315,12 +2309,12 @@
 		_numCostumes = _fileHandle.readUint16LE();
 		_numGlobalObjects = _fileHandle.readUint16LE();
 		_numImages = _fileHandle.readUint16LE();
-		_fileHandle.readUint16LE(); // unknown
-		_fileHandle.readUint16LE(); // _numLocalScriptOffsets
-		_fileHandle.readUint16LE(); // unknown
-		_fileHandle.readUint16LE(); // unknown
-		_fileHandle.readUint16LE(); // unknown
-		_numTalkie = _fileHandle.readUint16LE();
+		_numSprites = _fileHandle.readUint16LE();
+		_numLocalScriptOffsets = _fileHandle.readUint16LE();
+		_fileHandle.readUint16LE(); // heap related
+		_fileHandle.readUint16LE(); // _numPalettes?
+		_fileHandle.readUint16LE(); // _numSmacker?
+		_numTalkies = _fileHandle.readUint16LE();
 
 		/* TODO check these values */
 
@@ -2351,9 +2345,9 @@
 		_numCostumes = _fileHandle.readUint16LE();
 		_numGlobalObjects = _fileHandle.readUint16LE();
 		_numImages = _fileHandle.readUint16LE();
-		_fileHandle.readUint16LE(); // unknown
-		_fileHandle.readUint16LE(); // _numLocalScriptOffsets
-		_fileHandle.readUint16LE(); // unknown
+		_numSprites = _fileHandle.readUint16LE();
+		_numLocalScriptOffsets = _fileHandle.readUint16LE();
+		_fileHandle.readUint16LE(); // heap releated
 
 		/* TODO check these values */
 
@@ -2490,7 +2484,7 @@
 	allocResTypeData(rtMatrix, MKID('NONE'), 10, "boxes", 0);
 	allocResTypeData(rtImage, MKID('AWIZ'), _numImages, "images", 1);
 	allocResTypeData(rtRoomImage, MKID('RMIM'), _numRooms, "room image", 1);
-	allocResTypeData(rtTalkie, MKID('TLKE'), _numTalkie, "talkie", 1);
+	allocResTypeData(rtTalkie, MKID('TLKE'), _numTalkies, "talkie", 1);
 
 }
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- scumm.cpp	7 Sep 2004 14:31:19 -0000	1.178
+++ scumm.cpp	8 Sep 2004 05:58:36 -0000	1.179
@@ -522,7 +522,9 @@
 	_numActors = 0;
 	_numCostumes = 0;
 	_numImages = 0;
-	_numTalkie = 0;
+	_numLocalScriptOffsets = 0;
+	_numSprites = 0;
+	_numTalkies = 0;
 	_audioNames = NULL;
 	_numAudioNames = 0;
 	_curActor = 0;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -d -r1.473 -r1.474
--- scumm.h	7 Sep 2004 13:23:26 -0000	1.473
+++ scumm.h	8 Sep 2004 05:58:36 -0000	1.474
@@ -481,7 +481,7 @@
 	int _numInventory;
 	int _numNewNames, _numGlobalScripts;
 	int _numActors, _numRoomVariables;
-	int _numTalkie;
+	int _numLocalScriptOffsets, _numSprites, _numTalkies;
 public:
 	int _numImages, _numRooms, _numScripts, _numSounds;	// Used by VARS in HE games
 	int _numCostumes;	// FIXME - should be protected, used by Actor::remapActorPalette