ScummFile: Don't use the File::_ioFailed flag, rather track the io status separately; also, changed eof() -> eos()

svn-id: r34389

1 files changed, 3 insertions, 3 deletions

diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp
index bf13308a0c..075b44d24d 100644
--- a/engines/scumm/file.cpp
+++ b/engines/scumm/file.cpp
@@ -125,8 +125,8 @@ bool ScummFile::openSubFile(const Common::String &filename) {
 }
 
 
-bool ScummFile::eof() {
-	return _subFileLen ? (pos() >= _subFileLen) : File::eof();
+bool ScummFile::eos() {
+	return _subFileLen ? (pos() >= _subFileLen) : File::eos();
 }
 
 uint32 ScummFile::pos() {
@@ -167,7 +167,7 @@ uint32 ScummFile::read(void *dataPtr, uint32 dataSize) {
 		uint32 newPos = curPos + dataSize;
 		if (newPos > _subFileLen) {
 			dataSize = _subFileLen - curPos;
-			_ioFailed = true;
+			_myIoFailed = true;
 		}
 	}