[Scummvm-cvs-logs] SF.net SVN: scummvm:[35162] scummvm/trunk/engines/scumm

[thebluegr at users.sourceforge.net]

Revision: 35162
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35162&view=rev
Author:   thebluegr
Date:     2008-11-23 20:54:55 +0000 (Sun, 23 Nov 2008)

Log Message:
-----------
Oops, removed the *actual* unused code, and fixed my previous incorrect commit. DOTT and S&M work correctly again

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/file.cpp
    scummvm/trunk/engines/scumm/file.h
    scummvm/trunk/engines/scumm/file_nes.h

Modified: scummvm/trunk/engines/scumm/file.cpp
===================================================================
--- scummvm/trunk/engines/scumm/file.cpp	2008-11-23 15:44:47 UTC (rev 35161)
+++ scummvm/trunk/engines/scumm/file.cpp	2008-11-23 20:54:55 UTC (rev 35162)
@@ -124,12 +124,10 @@
 	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 @@
 	return File::seek(offs, whence);
 }
 
-// Unused
-#if 0
 uint32 ScummFile::read(void *dataPtr, uint32 dataSize) {
 	uint32 realLen;
 
@@ -190,7 +186,6 @@
 
 	return realLen;
 }
-#endif
 
 #pragma mark -
 #pragma mark --- ScummDiskImage ---

Modified: scummvm/trunk/engines/scumm/file.h
===================================================================
--- scummvm/trunk/engines/scumm/file.h	2008-11-23 15:44:47 UTC (rev 35161)
+++ scummvm/trunk/engines/scumm/file.h	2008-11-23 20:54:55 UTC (rev 35162)
@@ -70,15 +70,11 @@
 	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 @@
 	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

Modified: scummvm/trunk/engines/scumm/file_nes.h
===================================================================
--- scummvm/trunk/engines/scumm/file_nes.h	2008-11-23 15:44:47 UTC (rev 35161)
+++ scummvm/trunk/engines/scumm/file_nes.h	2008-11-23 20:54:55 UTC (rev 35162)
@@ -88,15 +88,11 @@
 	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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.