From b8ad54b3af1de97bf986e7e4d4da97f02ece3273 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sun, 27 Jun 2004 22:14:35 +0000 Subject: Reversed param order of File::open() -- this allowed me to get rid of a few more getGameDataPath() calls svn-id: r14090 --- queen/resource.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'queen') diff --git a/queen/resource.cpp b/queen/resource.cpp index 4b55824ec9..7184475d21 100644 --- a/queen/resource.cpp +++ b/queen/resource.cpp @@ -143,7 +143,7 @@ uint8 *Resource::loadFileMalloc(const char *filename, uint32 skipBytes, byte *ds } bool Resource::findNormalVersion() { - _resourceFile->open("queen.1", _datafilePath); + _resourceFile->open("queen.1"); if (!_resourceFile->isOpen()) { return false; } @@ -170,7 +170,7 @@ bool Resource::findNormalVersion() { } bool Resource::findCompressedVersion() { - _resourceFile->open("queen.1c", _datafilePath); + _resourceFile->open("queen.1c"); if (!_resourceFile->isOpen()) { return false; } @@ -215,9 +215,9 @@ Language Resource::getLanguage() const { bool Resource::readTableFile(const GameVersion *gameVersion) { File tableFile; - tableFile.open(_tableFilename, _datafilePath); + tableFile.open(_tableFilename); if (!tableFile.isOpen()) - tableFile.open(_tableFilename, ""); // try current directory + tableFile.open(_tableFilename, File::kFileReadMode, ""); // try current directory if (tableFile.isOpen() && tableFile.readUint32BE() == 'QTBL') { if (tableFile.readUint32BE() != CURRENT_TBL_VERSION) warning("Incorrect version of queen.tbl, please update it"); -- cgit v1.2.3