diff options
author | Max Horn | 2009-12-15 08:18:57 +0000 |
---|---|---|
committer | Max Horn | 2009-12-15 08:18:57 +0000 |
commit | f692015301e6122b7d071a0ce52c81faa6c3b69f (patch) | |
tree | e72e430a064eb6e8cf70610cb0e8e7154a9ee57d /engines/tinsel/music.cpp | |
parent | eb9b31782f094578d0d824962a5660d697e71486 (diff) | |
download | scummvm-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/tinsel/music.cpp')
-rw-r--r-- | engines/tinsel/music.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index a231c42013..6a50295afd 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -370,7 +370,7 @@ void OpenMidiFiles() { // gen length of the largest sequence midiBuffer.size = midiStream.readUint32LE(); - if (midiStream.ioFailed()) + if (midiStream.eos() || midiStream.err()) error(FILE_IS_CORRUPT, MIDI_FILE); if (midiBuffer.size) { @@ -860,7 +860,7 @@ bool PCMMusicPlayer::getNextChunk() { error(CANNOT_FIND_FILE, _fileName); file.seek(sampleOffset); - if (file.ioFailed() || (uint32)file.pos() != sampleOffset) + if (file.eos() || file.err() || (uint32)file.pos() != sampleOffset) error(FILE_IS_CORRUPT, _fileName); buffer = (byte *) malloc(sampleCLength); |