diff options
| author | Max Horn | 2003-12-12 15:29:58 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-12 15:29:58 +0000 |
| commit | 8f5c14aebe0ca423ede54e36d16d626bfab110ed (patch) | |
| tree | bb4a3d90f066e5764f36580650f234af72fe283e /queen/resource.cpp | |
| parent | 0b22651494f506ce53c250b7d1c1e6a81e9f4e1d (diff) | |
| download | scummvm-rg350-8f5c14aebe0ca423ede54e36d16d626bfab110ed.tar.gz scummvm-rg350-8f5c14aebe0ca423ede54e36d16d626bfab110ed.tar.bz2 scummvm-rg350-8f5c14aebe0ca423ede54e36d16d626bfab110ed.zip | |
get rid of queencomp target (rather simply always check for both queen.1 and queen.1c); this allows some code simplification and gets rid of the last access to detector->_game in queen
svn-id: r11599
Diffstat (limited to 'queen/resource.cpp')
| -rw-r--r-- | queen/resource.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/queen/resource.cpp b/queen/resource.cpp index c7d2a6acdc..9133c3c7f0 100644 --- a/queen/resource.cpp +++ b/queen/resource.cpp @@ -42,13 +42,15 @@ const GameVersion Resource::_gameVersions[] = { }; -Resource::Resource(const Common::String &datafilePath, const char *datafileName, SaveFileManager *mgr, const char *savePath) +Resource::Resource(const Common::String &datafilePath, SaveFileManager *mgr, const char *savePath) : _JAS2Pos(0), _datafilePath(datafilePath), _savePath(savePath), _resourceEntries(0), _resourceTable(NULL), _saveFileManager(mgr) { _resourceFile = new File(); - _resourceFile->open(datafileName, _datafilePath); + _resourceFile->open("queen.1", _datafilePath); if (_resourceFile->isOpen() == false) - error("Could not open resource file '%s%s'", _datafilePath.c_str(), datafileName); + _resourceFile->open("queen.1c", _datafilePath); + if (_resourceFile->isOpen() == false) + error("Could not open resource file '%s%s'", _datafilePath.c_str(), "queen.1"); if (_resourceFile->readUint32BE() == 'QTBL') { readTableCompResource(); |