diff options
| author | Max Horn | 2008-09-06 21:23:08 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-06 21:23:08 +0000 |
| commit | 6bfa3e274a882dc0ac0b8362b225ae3234f4830b (patch) | |
| tree | bb625613d1a715fa4feeef37509f721163fc0941 /engines/made | |
| parent | 7a7e7102908e5e9468ad9cf4077c5ded0657bb50 (diff) | |
| download | scummvm-rg350-6bfa3e274a882dc0ac0b8362b225ae3234f4830b.tar.gz scummvm-rg350-6bfa3e274a882dc0ac0b8362b225ae3234f4830b.tar.bz2 scummvm-rg350-6bfa3e274a882dc0ac0b8362b225ae3234f4830b.zip | |
Got rid of File::eof()
svn-id: r34396
Diffstat (limited to 'engines/made')
| -rw-r--r-- | engines/made/pmvplayer.cpp | 4 | ||||
| -rw-r--r-- | engines/made/redreader.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/made/pmvplayer.cpp b/engines/made/pmvplayer.cpp index 831f1fab8e..6fe0f1c80d 100644 --- a/engines/made/pmvplayer.cpp +++ b/engines/made/pmvplayer.cpp @@ -95,13 +95,13 @@ void PmvPlayer::play(const char *filename) { // get it to work well? _audioStream = Audio::makeAppendableAudioStream(soundFreq, Audio::Mixer::FLAG_UNSIGNED); - while (!_abort && !_fd->eof()) { + while (!_abort && !_fd->eos()) { int32 frameTime = _vm->_system->getMillis(); readChunk(chunkType, chunkSize); - if (_fd->eof()) + if (_fd->eos()) break; frameData = new byte[chunkSize]; diff --git a/engines/made/redreader.cpp b/engines/made/redreader.cpp index 287574c312..5d0721bc1f 100644 --- a/engines/made/redreader.cpp +++ b/engines/made/redreader.cpp @@ -55,7 +55,7 @@ Common::MemoryReadStream *RedReader::loadFromRed(const char *redFilename, const bool RedReader::seekFile(Common::File &fd, FileEntry &fileEntry, const char *filename) { char arcFilename[13]; - while (!fd.eof()) { + while (!fd.eos()) { fd.skip(8); // skip unknown fileEntry.compSize = fd.readUint32LE(); fileEntry.origSize = fd.readUint32LE(); |