diff options
| author | Max Horn | 2009-07-15 10:04:50 +0000 |
|---|---|---|
| committer | Max Horn | 2009-07-15 10:04:50 +0000 |
| commit | baabc623f6e328718f94e907ce15112ec3078305 (patch) | |
| tree | c2a1f53dddf0dd96a18fd4ba65d325e9376eae52 | |
| parent | 544bf83f33d41499b14e891a8eb395e556673b97 (diff) | |
| download | scummvm-rg350-baabc623f6e328718f94e907ce15112ec3078305.tar.gz scummvm-rg350-baabc623f6e328718f94e907ce15112ec3078305.tar.bz2 scummvm-rg350-baabc623f6e328718f94e907ce15112ec3078305.zip | |
Got rid of two more ioFailed uses
svn-id: r42501
| -rw-r--r-- | engines/groovie/resource.cpp | 2 | ||||
| -rw-r--r-- | sound/aiff.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/groovie/resource.cpp b/engines/groovie/resource.cpp index eda3f0bec0..148fa9c451 100644 --- a/engines/groovie/resource.cpp +++ b/engines/groovie/resource.cpp @@ -98,7 +98,7 @@ uint16 ResMan_t7g::getRef(Common::String name, Common::String scriptname) { uint16 resNum; bool found = false; - for (resNum = 0; !found && !rlFile.ioFailed(); resNum++) { + for (resNum = 0; !found && !rlFile.err() && !rlFile.eos(); resNum++) { // Read the resource name char readname[12]; rlFile.read(readname, 12); diff --git a/sound/aiff.cpp b/sound/aiff.cpp index 884becb212..3c8a7f02a4 100644 --- a/sound/aiff.cpp +++ b/sound/aiff.cpp @@ -94,7 +94,7 @@ bool loadAIFFFromStream(Common::SeekableReadStream &stream, int &size, int &rate uint16 numChannels = 0, bitsPerSample = 0; uint32 numSampleFrames = 0, offset = 0, blockSize = 0, soundOffset = 0; - while ((!foundCOMM || !foundSSND) && !stream.ioFailed()) { + while (!(foundCOMM && foundSSND) && !stream.err() && !stream.eos()) { uint32 length, pos; stream.read(buf, 4); |