[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.354,1.355

kirben kirben at users.sourceforge.net
Mon Jan 16 00:51:01 CET 2006


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

Modified Files:
	resource.cpp 
Log Message:

Move over more version specific index blocks.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -d -r1.354 -r1.355
--- resource.cpp	16 Jan 2006 00:40:49 -0000	1.354
+++ resource.cpp	16 Jan 2006 08:50:03 -0000	1.355
@@ -440,6 +440,10 @@
 		_imuseDigital->setAudioNames(num, ptr);
 		break;
 
+	case MKID('DRSC'):		// Used by: COMI
+		readResTypeList(rtRoomScripts, MKID('RMSC'), "room script");
+		break;
+
 	default:
 		ScummEngine::readIndexBlock(blocktype, itemsize);
 	}
@@ -450,6 +454,18 @@
 void ScummEngine_v70he::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 	int i;
 	switch (blocktype) {
+	case MKID('DIRI'):
+		readResTypeList(rtRoomImage, MKID('RMIM'), "room image");
+		break;
+
+	case MKID('DIRM'):
+		readResTypeList(rtImage, MKID('AWIZ'), "images");
+		break;
+
+	case MKID('DIRT'):
+		readResTypeList(rtTalkie, MKID('TLKE'), "talkie");
+		break;
+
 	case MKID('DLFL'):
 		i = _fileHandle->readUint16LE();
 		_fileHandle->seek(-2, SEEK_CUR);
@@ -464,8 +480,8 @@
 		break;
 
 	case MKID('SVER'):
+		// Index version number
 		_fileHandle->seek(itemsize - 8, SEEK_CUR);
-		debug(0, "SVER index block not yet handled, skipping");
 		break;
 
 	case MKID('INIB'):
@@ -516,27 +532,11 @@
 		}
 		break;
 
-	case MKID('DIRM'):
-		readResTypeList(rtImage, MKID('AWIZ'), "images");
-		break;
-
-	case MKID('DIRT'):
-		readResTypeList(rtTalkie, MKID('TLKE'), "talkie");
-		break;
-
-	case MKID('DIRI'):
-		readResTypeList(rtRoomImage, MKID('RMIM'), "room image");
-		break;
-
-	case MKID('DIRR'):
 	case MKID('DROO'):
+	case MKID('DIRR'):
 		readResTypeList(rtRoom, MKID('ROOM'), "room");
 		break;
 
-	case MKID('DRSC'):
-		readResTypeList(rtRoomScripts, MKID('RMSC'), "room script");
-		break;
-
 	case MKID('DSCR'):
 	case MKID('DIRS'):
 		readResTypeList(rtScript, MKID('SCRP'), "script");





More information about the Scummvm-git-logs mailing list