From f9208f1bb0e083a4e7ebc30051599cdbfbcf9d26 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 20 Jul 2009 20:55:28 +0000
Subject: Make ScummFile::eos() consistent with Stream::eos(). Remove usage of
 ioFailed from SCUMM engine. Fix reading up to the end of a SCUMM SubFile.
 This hopefully fixes #2820957.

svn-id: r42632
---
 engines/scumm/he/cup_player_he.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'engines/scumm/he/cup_player_he.cpp')

diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp
index 51176c5df9..39615edb6a 100644
--- a/engines/scumm/he/cup_player_he.cpp
+++ b/engines/scumm/he/cup_player_he.cpp
@@ -91,20 +91,19 @@ void CUP_Player::close() {
 }
 
 void CUP_Player::play() {
-	while (parseNextHeaderTag(_fileStream)) {
-		if (_fileStream.ioFailed()) {
-			return;
-		}
-	}
+	while (parseNextHeaderTag(_fileStream)) { }
+
+	if (_fileStream.eos() || _fileStream.err())
+		return;
+
 	debug(1, "rate %d width %d height %d", _playbackRate, _width, _height);
 
 	int ticks = _system->getMillis();
 	while (_dataSize != 0 && !_vm->shouldQuit()) {
-		while (parseNextBlockTag(_fileStream)) {
-			if (_fileStream.ioFailed()) {
-				return;
-			}
-		}
+		while (parseNextBlockTag(_fileStream)) { }
+		if (_fileStream.eos() || _fileStream.err())
+			return;
+
 		int diff = _system->getMillis() - ticks;
 		if (diff >= 0 && diff <= _playbackRate) {
 			_system->delayMillis(_playbackRate - diff);
@@ -200,6 +199,10 @@ void CUP_Player::waitForSfxChannel(int channel) {
 bool CUP_Player::parseNextHeaderTag(Common::SeekableReadStream &dataStream) {
 	uint32 tag = dataStream.readUint32BE();
 	uint32 size = dataStream.readUint32BE() - 8;
+
+	if (dataStream.eos())
+		return false;
+
 	uint32 next = dataStream.pos() + size;
 	debug(1, "New header tag %s %d dataSize %d", tag2str(tag), size, _dataSize);
 	switch (tag) {
-- 
cgit v1.2.3