From a1a9702f24b868f2e5d9189ea83f00bb73272bbf Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 23 Nov 2008 20:54:55 +0000
Subject: Oops, removed the *actual* unused code, and fixed my previous
 incorrect commit. DOTT and S&M work correctly again

svn-id: r35162
---
 engines/scumm/file.cpp   |  7 +------
 engines/scumm/file.h     | 12 ++----------
 engines/scumm/file_nes.h |  6 +-----
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp
index 87b059be3b..38c7a1a180 100644
--- a/engines/scumm/file.cpp
+++ b/engines/scumm/file.cpp
@@ -124,12 +124,10 @@ bool ScummFile::openSubFile(const Common::String &filename) {
 	return false;
 }
 
-// Unused
-#if 0
+
 bool ScummFile::eos() const {
 	return _subFileLen ? (pos() >= _subFileLen) : File::eos(); // FIXME
 }
-#endif
 
 int32 ScummFile::pos() const {
 	return File::pos() - _subFileStart;
@@ -159,8 +157,6 @@ bool ScummFile::seek(int32 offs, int whence) {
 	return File::seek(offs, whence);
 }
 
-// Unused
-#if 0
 uint32 ScummFile::read(void *dataPtr, uint32 dataSize) {
 	uint32 realLen;
 
@@ -190,7 +186,6 @@ uint32 ScummFile::read(void *dataPtr, uint32 dataSize) {
 
 	return realLen;
 }
-#endif
 
 #pragma mark -
 #pragma mark --- ScummDiskImage ---
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
diff --git a/engines/scumm/file_nes.h b/engines/scumm/file_nes.h
index 20d82376bd..b255705922 100644
--- a/engines/scumm/file_nes.h
+++ b/engines/scumm/file_nes.h
@@ -88,15 +88,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
-- 
cgit v1.2.3