aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/file.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm/file.h')
-rw-r--r--engines/scumm/file.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/engines/scumm/file.h b/engines/scumm/file.h
index b4228f2d7a..aa52dd069f 100644
--- a/engines/scumm/file.h
+++ b/engines/scumm/file.h
@@ -70,15 +70,11 @@ 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 {
@@ -119,15 +115,11 @@ 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