diff options
| author | Max Horn | 2009-07-29 21:39:34 +0000 |
|---|---|---|
| committer | Max Horn | 2009-07-29 21:39:34 +0000 |
| commit | e9cd07e582d27d1e329269d4e3d544eea03f0131 (patch) | |
| tree | b356d66f64363c62d7724d69147a553d8910d141 /engines/sword1 | |
| parent | eedce48aa39b424c7b93c5f5069fd1be89878bdc (diff) | |
| download | scummvm-rg350-e9cd07e582d27d1e329269d4e3d544eea03f0131.tar.gz scummvm-rg350-e9cd07e582d27d1e329269d4e3d544eea03f0131.tar.bz2 scummvm-rg350-e9cd07e582d27d1e329269d4e3d544eea03f0131.zip | |
SWORD1 & SWORD2: Replaced ioFailed by err+eos
svn-id: r42912
Diffstat (limited to 'engines/sword1')
| -rw-r--r-- | engines/sword1/control.cpp | 2 | ||||
| -rw-r--r-- | engines/sword1/resman.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index 756ce3a5cc..09d2197f2a 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -1207,7 +1207,7 @@ bool Control::restoreGameFromFile(uint8 slot) { for (uint32 cnt2 = 0; cnt2 < playerSize; cnt2++) playerBuf[cnt2] = inf->readUint32LE(); - if (inf->ioFailed()) { + if (inf->err() || inf->eos()) { displayMessage(0, "Can't read from file '%s'. (%s)", fName, _saveFileMan->popErrorDesc().c_str()); delete inf; free(_restoreBuf); diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp index 979bd3210a..90ea5fe677 100644 --- a/engines/sword1/resman.cpp +++ b/engines/sword1/resman.cpp @@ -263,9 +263,9 @@ void ResMan::resOpen(uint32 id) { // load resource ID into memory _memMan->alloc(memHandle, size); Common::File *clusFile = resFile(id); assert(clusFile); - clusFile->seek( resOffset(id) ); - clusFile->read( memHandle->data, size); - if (clusFile->ioFailed()) { + clusFile->seek(resOffset(id)); + clusFile->read(memHandle->data, size); + if (clusFile->err() || clusFile->eos()) { error("Can't read %d bytes from offset %d from cluster file %s\nResource ID: %d (%08X)", size, resOffset(id), _prj.clu[(id >> 24) - 1].label, id, id); } } else |