[Scummvm-git-logs] scummvm master -> ff2741b01a0062f5f28cd11b7ef087f7d1bda1b7

[moralrecordings]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ff2741b01a DIRECTOR: Fix cascade failure in VWCR loader


Commit: ff2741b01a0062f5f28cd11b7ef087f7d1bda1b7
    https://github.com/scummvm/scummvm/commit/ff2741b01a0062f5f28cd11b7ef087f7d1bda1b7
Author: Scott Percival (code at moral.net.au)
Date: 2020-06-21T18:24:05+08:00

Commit Message:
DIRECTOR: Fix cascade failure in VWCR loader

Changed paths:
    engines/director/score-loading.cpp


diff --git a/engines/director/score-loading.cpp b/engines/director/score-loading.cpp
index 4bc17a3531..e5d4709d6f 100644
--- a/engines/director/score-loading.cpp
+++ b/engines/director/score-loading.cpp
@@ -649,6 +649,7 @@ void Score::loadCastDataVWCR(Common::SeekableSubReadStreamEndian &stream) {
 
 		uint8 castType = stream.readByte();
 
+		int returnPos = stream.pos() + size - 1;
 		switch (castType) {
 		case kCastBitmap:
 			debugC(3, kDebugLoading, "Score::loadCastDataVWCR(): CastTypes id: %d(%s) BitmapCast", id, numToCastNum(id));
@@ -686,6 +687,7 @@ void Score::loadCastDataVWCR(Common::SeekableSubReadStreamEndian &stream) {
 			stream.skip(size - 1);
 			continue;
 		}
+		stream.seek(returnPos);
 		_loadedCast->getVal(id)->_score = this;
 	}
 }