diff options
author | Einar Johan Trøan Sømåen | 2012-07-25 00:08:39 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-07-25 00:08:39 +0200 |
commit | 8be1e095fd6ab78f8f90633d254643f5bb45ffd4 (patch) | |
tree | 9e70770f66f4dd57e5804fe2fa746ce33ced18aa /engines/wintermute/base/file/base_package.cpp | |
parent | c59965ad4faca67be0dad554bc291a97f2691dff (diff) | |
download | scummvm-rg350-8be1e095fd6ab78f8f90633d254643f5bb45ffd4.tar.gz scummvm-rg350-8be1e095fd6ab78f8f90633d254643f5bb45ffd4.tar.bz2 scummvm-rg350-8be1e095fd6ab78f8f90633d254643f5bb45ffd4.zip |
WINTERMUTE: Avoid starting up the engine to perform detection.
Diffstat (limited to 'engines/wintermute/base/file/base_package.cpp')
-rw-r--r-- | engines/wintermute/base/file/base_package.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp index 427f2f46f8..1706a7a50b 100644 --- a/engines/wintermute/base/file/base_package.cpp +++ b/engines/wintermute/base/file/base_package.cpp @@ -57,10 +57,10 @@ BasePackage::~BasePackage() { //////////////////////////////////////////////////////////////////////////
bool BasePackage::open() {
- if (_file) return STATUS_OK;
+ if (_file) return true;
else {
_file = getFilePointer();
- return _file ? STATUS_OK : STATUS_FAILED;
+ return _file ? true : false;
}
}
@@ -69,18 +69,18 @@ bool BasePackage::open() { bool BasePackage::close() {
delete _file;
_file = NULL;
- return STATUS_OK;
+ return true;
}
//////////////////////////////////////////////////////////////////////////
bool BasePackage::read(Common::SeekableReadStream *file, uint32 offset, byte *buffer, uint32 size) {
bool ret;
- if (DID_FAIL(ret = open())) return ret;
+ if (!(ret = open())) return ret;
else {
- if (file->seek(offset, SEEK_SET)) return STATUS_FAILED;
- if (file->read(buffer, size) != 1) return STATUS_FAILED;
- else return STATUS_OK;
+ if (file->seek(offset, SEEK_SET)) return false;
+ if (file->read(buffer, size) != 1) return false;
+ else return true;
}
}
|