aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
authorGregory Montoir2003-12-31 16:15:46 +0000
committerGregory Montoir2003-12-31 16:15:46 +0000
commit1194bc9d5eb14fda4e5a44a9ced64fd5d578bb47 (patch)
tree665d3f72cd8e846a47385f98be49a46179113732 /queen
parentd176a6a6e1b807c0f6c5ae100fd2ed0977210dd3 (diff)
downloadscummvm-rg350-1194bc9d5eb14fda4e5a44a9ced64fd5d578bb47.tar.gz
scummvm-rg350-1194bc9d5eb14fda4e5a44a9ced64fd5d578bb47.tar.bz2
scummvm-rg350-1194bc9d5eb14fda4e5a44a9ced64fd5d578bb47.zip
use compressed data file instead of original one if both are available
svn-id: r12059
Diffstat (limited to 'queen')
-rw-r--r--queen/resource.cpp2
-rw-r--r--queen/resource.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/queen/resource.cpp b/queen/resource.cpp
index cf027c5e53..2785450836 100644
--- a/queen/resource.cpp
+++ b/queen/resource.cpp
@@ -47,7 +47,7 @@ Resource::Resource(const Common::String &datafilePath, SaveFileManager *mgr, con
: _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);
diff --git a/queen/resource.h b/queen/resource.h
index c0833a9b00..d4b9f0f319 100644
--- a/queen/resource.h
+++ b/queen/resource.h
@@ -37,7 +37,7 @@ enum Version {
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