[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.61,1.62
Jonathan Gray
khalek at users.sourceforge.net
Sun Apr 27 22:55:12 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv21821
Modified Files:
resource.cpp
Log Message:
add some he v7 blocks
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- resource.cpp 20 Apr 2003 00:56:23 -0000 1.61
+++ resource.cpp 28 Apr 2003 05:54:54 -0000 1.62
@@ -223,6 +223,7 @@
uint32 blocktype, itemsize;
int numblock = 0;
int num, i;
+ bool stop = false;
debug(9, "readIndexFile()");
@@ -267,7 +268,7 @@
_fileHandle.seek(0, SEEK_SET);
}
- while (1) {
+ while (!stop) {
blocktype = fileReadDword();
if (_fileHandle.ioFailed())
@@ -280,7 +281,11 @@
case MKID('DCHR'):
readResTypeList(rtCharset, MKID('CHAR'), "charset");
break;
-
+
+ case MKID('DIRF'):
+ readResTypeList(rtCharset, MKID('DIRF'), "charset");
+ break;
+
case MKID('DOBJ'):
if (_features & GF_AFTER_V8)
num = _fileHandle.readUint32LE();
@@ -325,9 +330,15 @@
break;
case MKID('RNAM'):
+ case MKID('DIRI'):
+ case MKID('DLFL'):
_fileHandle.seek(itemsize - 8, SEEK_CUR);
break;
+ case 0xFFFFFFFF:
+ stop = true;
+ break;
+
case MKID('ANAM'):
_numAudioNames = _fileHandle.readUint16LE();
_audioNames = (char*)malloc(_numAudioNames * 9);
@@ -338,6 +349,10 @@
readResTypeList(rtRoom, MKID('ROOM'), "room");
break;
+ case MKID('DIRR'):
+ readResTypeList(rtRoom, MKID('DIRR'), "room");
+ break;
+
case MKID('DRSC'): // FIXME: Verify
readResTypeList(rtRoomScripts, MKID('RMSC'), "room script");
break;
@@ -346,16 +361,28 @@
readResTypeList(rtScript, MKID('SCRP'), "script");
break;
+ case MKID('DIRS'):
+ readResTypeList(rtScript, MKID('DIRS'), "script");
+ break;
+
case MKID('DCOS'):
readResTypeList(rtCostume, MKID('COST'), "costume");
break;
+ case MKID('DIRC'):
+ readResTypeList(rtCostume, MKID('DIRC'), "costume");
+ break;
+
case MKID('MAXS'):
readMAXS();
break;
case MKID('DSOU'):
readResTypeList(rtSound, MKID('SOUN'), "sound");
+ break;
+
+ case MKID('DIRN'):
+ readResTypeList(rtSound, MKID('DIRN'), "sound");
break;
case MKID('AARY'):
More information about the Scummvm-git-logs
mailing list