Got rid of two more ioFailed uses

svn-id: r42501
This commit is contained in:
Max Horn 2009-07-15 10:04:50 +00:00
parent 544bf83f33
commit baabc623f6
2 changed files with 2 additions and 2 deletions

View File

@ -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);

View File

@ -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);