diff options
Diffstat (limited to 'engines/scumm/file.h')
-rw-r--r-- | engines/scumm/file.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/engines/scumm/file.h b/engines/scumm/file.h index e0ba7badff..b4228f2d7a 100644 --- a/engines/scumm/file.h +++ b/engines/scumm/file.h @@ -39,11 +39,15 @@ public: virtual bool open(const Common::String &filename) = 0; virtual bool openSubFile(const Common::String &filename) = 0; - virtual bool eos() const = 0; virtual int32 pos() const = 0; virtual int32 size() const = 0; virtual bool seek(int32 offs, int whence = SEEK_SET) = 0; + +// Unused +#if 0 + virtual bool eos() const = 0; virtual uint32 read(void *dataPtr, uint32 dataSize) = 0; +#endif }; class ScummFile : public BaseScummFile { @@ -66,11 +70,15 @@ public: bool ioFailed() const { return _myIoFailed || BaseScummFile::ioFailed(); } void clearIOFailed() { _myIoFailed = false; BaseScummFile::clearIOFailed(); } - bool eos() const; int32 pos() const; int32 size() const; bool seek(int32 offs, int whence = SEEK_SET); + +// Unused +#if 0 + bool eos() const; uint32 read(void *dataPtr, uint32 dataSize); +#endif }; class ScummDiskImage : public BaseScummFile { @@ -111,11 +119,15 @@ public: bool openSubFile(const Common::String &filename); void close(); - bool eos() const { return _stream->eos(); } int32 pos() const { return _stream->pos(); } int32 size() const { return _stream->size(); } bool seek(int32 offs, int whence = SEEK_SET) { return _stream->seek(offs, whence); } + +// Unused +#if 0 + bool eos() const { return _stream->eos(); } uint32 read(void *dataPtr, uint32 dataSize) { return _stream->read(dataPtr, dataSize); } +#endif }; } // End of namespace Scumm |