[Scummvm-cvs-logs] CVS: scummvm/queen resource.cpp,1.36,1.37 resource.h,1.27,1.28

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv13668/queen

Modified Files:
	resource.cpp resource.h 
Log Message:
use compressed data file instead of original one if both are available

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- resource.cpp	30 Dec 2003 21:06:22 -0000	1.36
+++ resource.cpp	31 Dec 2003 16:15:46 -0000	1.37
@@ -47,7 +47,7 @@
 	: _JAS2Pos(0), _datafilePath(datafilePath), _savePath(savePath), _resourceEntries(0), _resourceTable(NULL), _saveFileManager(mgr) {
 
 	_resourceFile = new File();
-	if (!findNormalVersion() && !findCompressedVersion())
+	if (!findCompressedVersion() && !findNormalVersion())
 		error("Could not open resource file '%s%s'", _datafilePath.c_str(), "queen.1");
 	checkJASVersion();
 	debug(5, "Detected game version: %s, which has %d resource entries", _versionString, _resourceEntries);

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- resource.h	30 Dec 2003 21:06:22 -0000	1.27
+++ resource.h	31 Dec 2003 16:15:46 -0000	1.28
@@ -37,7 +37,7 @@
 	VER_GER_TALKIE   = 5,
 	VER_ITA_FLOPPY   = 6,
 	VER_ITA_TALKIE   = 7,
-	// VER_ITA_FLOPPY
+	// VER_SPA_FLOPPY
 	VER_SPA_TALKIE   = 8,
 	// VER_HEB_FLOPPY
 	// VER_HEB_TALKIE