[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.70,1.71

Max Horn fingolfin at users.sourceforge.net
Thu May 1 15:27:31 CEST 2003


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

Modified Files:
	resource.cpp 
Log Message:
umpf

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- resource.cpp	1 May 2003 22:19:10 -0000	1.70
+++ resource.cpp	1 May 2003 22:26:30 -0000	1.71
@@ -485,8 +485,8 @@
 		}
 		for (i = 0; i < num; i++) {
 			res.roomoffs[id][i] = _fileHandle.readUint16LE();
-			if (roomoffs[id][i] == 0xFFFF)
-				roomoffs[id][i] = 0xFFFFFFFF;
+			if (res.roomoffs[id][i] == 0xFFFF)
+				res.roomoffs[id][i] = 0xFFFFFFFF;
 		}
 
 	} else if (_features & GF_SMALL_HEADER) {
@@ -623,6 +623,9 @@
 	openRoom(roomNr);
 
 	_fileHandle.seek(fileOffs + _fileOffset, SEEK_SET);
+if (type == rtSound) {
+	printf("fileOffs = %d, _fileOffset = %d\n", fileOffs, _fileOffset);
+}
 
 	if (_features & GF_OLD_BUNDLE) {
 		size = _fileHandle.readUint16LE();
@@ -659,6 +662,10 @@
 	// dump the resource if requested
 	if (_dumpScripts && type == rtScript) {
 		dumpResource("script-", idx, getResourceAddress(rtScript, idx));
+	}
+
+	if (type == rtSound) {
+		dumpResource("sound-", idx, getResourceAddress(rtScript, idx));
 	}
 
 	if (!_fileHandle.ioFailed()) {





More information about the Scummvm-git-logs mailing list