diff options
| -rw-r--r-- | common/file.h | 9 | ||||
| -rw-r--r-- | engines/kyra/vqa.cpp | 6 | ||||
| -rw-r--r-- | engines/m4/resource.cpp | 4 | ||||
| -rw-r--r-- | engines/made/pmvplayer.cpp | 4 | ||||
| -rw-r--r-- | engines/made/redreader.cpp | 2 |
5 files changed, 8 insertions, 17 deletions
diff --git a/common/file.h b/common/file.h index c81a7c87d1..dcbc0244af 100644 --- a/common/file.h +++ b/common/file.h @@ -92,15 +92,6 @@ public: void clearIOFailed(); bool eos() const; - /** - * Checks for end of file. - * - * @deprecated: use eos() instead - * - * @return: true if the end of file is reached, false otherwise. - */ - virtual bool eof() const { return eos(); } - virtual uint32 pos() const; virtual uint32 size() const; void seek(int32 offs, int whence = SEEK_SET); diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index c55c573ea3..d5b63bdf6b 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -323,7 +323,7 @@ bool VQAMovie::open(const char *filename) { uint32 scanTag = readTag(); uint32 scanSize = _file.readUint32BE(); - if (_file.eof()) + if (_file.eos()) break; if (scanTag == MKID_BE('VQFR')) { @@ -396,7 +396,7 @@ void VQAMovie::displayFrame(uint frameNum) { uint32 tag = readTag(); uint32 size = _file.readUint32BE(); - if (_file.eof()) { + if (_file.eos()) { // This happens at the last frame. Apparently it has // no sound? break; @@ -596,7 +596,7 @@ void VQAMovie::play() { uint32 tag = readTag(); uint32 size = _file.readUint32BE(); - if (_file.eof()) { + if (_file.eos()) { warning("VQAMovie::play: Unexpected EOF"); break; } diff --git a/engines/m4/resource.cpp b/engines/m4/resource.cpp index 5070a2b79c..265e4dae0b 100644 --- a/engines/m4/resource.cpp +++ b/engines/m4/resource.cpp @@ -76,11 +76,11 @@ FileSystem::FileSystem(const char *hashFilename) { } /* load hagfile records and update the list */ - while (!hashFile.eof()) { + while (!hashFile.eos()) { HashHagEntry entry; hashFile.read(entry.filename, kM4MaxFilenameSize); entry.fileIndex = hashFile.readByte(); - if (hashFile.eof()) + if (hashFile.eos()) break; changeExtension(_hagEntries[entry.fileIndex].filename, entry.filename, "HAG"); 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(); |