[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.211,1.212 scumm.cpp,1.41,1.42

[Eugene Sandulenko]

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

Modified Files:
	resource.cpp scumm.cpp 
Log Message:
More HE v7.0+ resource fixes.
Make puttdemo.win runnable again.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- resource.cpp	7 Jun 2004 00:26:08 -0000	1.211
+++ resource.cpp	21 Jun 2004 10:06:52 -0000	1.212
@@ -622,7 +622,7 @@
 	if (roomNr == 0)
 		roomNr = _roomResource;
 
-	if (type == rtRoom) {
+	if (type == rtRoom && _heversion < 70) {
 		if (_version == 8)
 			fileOffs = 8;
 		else
@@ -653,6 +653,11 @@
 		if ((type == rtSound) && !(_features & GF_AMIGA) && !(_features & GF_FMTOWNS)) {
 			return readSoundResourceSmallHeader(type, idx);
 		}
+	} else if (_heversion >= 70) {
+		tag = _fileHandle.readUint32LE();
+		size = _fileHandle.readUint32BE() + 8;
+
+		_fileHandle.seek(-8, SEEK_CUR);
 	} else {
 		if (type == rtSound) {
 			return readSoundResource(type, idx);
@@ -1712,7 +1717,7 @@
 }
 
 int ScummEngine::getResourceRoomNr(int type, int idx) {
-	if (type == rtRoom)
+	if (type == rtRoom && _heversion < 70)
 		return idx;
 	return res.roomno[type][idx];
 }

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- scumm.cpp	20 Jun 2004 21:01:31 -0000	1.41
+++ scumm.cpp	21 Jun 2004 10:06:52 -0000	1.42
@@ -2990,7 +2990,7 @@
 
 		// There are both Windows and DOS versions of early HE titles
 		// specify correct version here
-		if (game.features & GF_HUMONGOUS && game.heversion == 60)
+		if (game.features & GF_HUMONGOUS && (game.heversion == 60 || game.id == GID_PUTTDEMO))
 			game.heversion = 70;
 		break;
 	case Common::kPlatformFMTowns: