[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.58,1.59 scummvm.cpp,2.83,2.84

[Max Horn]

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

Modified Files:
	resource.cpp scummvm.cpp 
Log Message:
fixed resource loading in GF_OLD_BUNDLE games (res header = 2 bytes length, plus 2 unknown bytes)

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- resource.cpp	11 Apr 2003 11:40:35 -0000	1.58
+++ resource.cpp	11 Apr 2003 22:15:59 -0000	1.59
@@ -568,6 +568,7 @@
 
 	if (_features & GF_OLD_BUNDLE) {
 		size = _fileHandle.readUint16LE();
+		_fileHandle.seek(-2, SEEK_CUR);
 	} else if (_features & GF_SMALL_HEADER) {
 		if (!(_features & GF_SMALL_NAMES))
 			_fileHandle.seek(8, SEEK_CUR);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.83
retrieving revision 2.84
diff -u -d -r2.83 -r2.84
--- scummvm.cpp	11 Apr 2003 11:40:56 -0000	2.83
+++ scummvm.cpp	11 Apr 2003 22:15:59 -0000	2.84
@@ -1719,7 +1719,7 @@
 	}
 
 	if (_features & GF_OLD_BUNDLE)
-		_resourceHeaderSize = 2; // FIXME - to be rechecked
+		_resourceHeaderSize = 4; // FIXME - to be rechecked
 	else if (_features & GF_SMALL_HEADER)
 		_resourceHeaderSize = 6;
 	else