aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/decompressor.cpp
diff options
context:
space:
mode:
authorMax Horn2009-12-15 08:18:57 +0000
committerMax Horn2009-12-15 08:18:57 +0000
commitf692015301e6122b7d071a0ce52c81faa6c3b69f (patch)
treee72e430a064eb6e8cf70610cb0e8e7154a9ee57d /engines/sci/decompressor.cpp
parenteb9b31782f094578d0d824962a5660d697e71486 (diff)
downloadscummvm-rg350-f692015301e6122b7d071a0ce52c81faa6c3b69f.tar.gz
scummvm-rg350-f692015301e6122b7d071a0ce52c81faa6c3b69f.tar.bz2
scummvm-rg350-f692015301e6122b7d071a0ce52c81faa6c3b69f.zip
Got rid of ReadStream::ioFailed()
svn-id: r46379
Diffstat (limited to 'engines/sci/decompressor.cpp')
-rw-r--r--engines/sci/decompressor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/decompressor.cpp b/engines/sci/decompressor.cpp
index 4731c87427..c213fca1ed 100644
--- a/engines/sci/decompressor.cpp
+++ b/engines/sci/decompressor.cpp
@@ -36,13 +36,13 @@
namespace Sci {
int Decompressor::unpack(Common::ReadStream *src, byte *dest, uint32 nPacked, uint32 nUnpacked) {
uint32 chunk;
- while (nPacked && !src->ioFailed()) {
+ while (nPacked && !(src->eos() || src->err())) {
chunk = MIN<uint32>(1024, nPacked);
src->read(dest, chunk);
nPacked -= chunk;
dest += chunk;
}
- return src->ioFailed() ? 1 : 0;
+ return (src->eos() || src->err()) ? 1 : 0;
}
void Decompressor::init(Common::ReadStream *src, byte *dest, uint32 nPacked,