[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.220,1.221

Jonathan Gray khalek at users.sourceforge.net
Fri Jun 25 20:02:48 CEST 2004


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

Modified Files:
	resource.cpp 
Log Message:
let my Scummsys.90 version of freddi get detected properly

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- resource.cpp	25 Jun 2004 10:58:47 -0000	1.220
+++ resource.cpp	26 Jun 2004 03:00:37 -0000	1.221
@@ -2090,7 +2090,11 @@
 			_numGlobalScripts = 2000;
 
 		_shadowPaletteSize = NUM_SHADOW_PALETTE * 256;
-	} else if (_heversion >= 72) { // sputm7.2
+	// check blocksize instead of just >= 72 as some 70 targets have later engine versions
+	// freddi being an example of this
+	} else if (_heversion >= 70 && blockSize > 38) { // sputm7.2
+		if (_heversion < 72)
+			_heversion = 72;
 		if (blockSize != 32 + 8) {
 			if (blockSize == 44 + 8)
 				error("MAXS blocks from C++ based games not yet supported");





More information about the Scummvm-git-logs mailing list