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

[djsrv]

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:
c2824fef44 DIRECTOR: Adjust cast info ID offset


Commit: c2824fef445e5414ea2afaa9a1e797c9adf21497
    https://github.com/scummvm/scummvm/commit/c2824fef445e5414ea2afaa9a1e797c9adf21497
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-15T15:42:02-04:00

Commit Message:
DIRECTOR: Adjust cast info ID offset

puppetSound could not find the correct cast member when _castIDoffset
was non-zero. Subtracting the offset during load instead of expecting it
to be added elsewhere leaves less room for mistakes.

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


diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index 06c79c959e..17c045276c 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -180,8 +180,8 @@ void Lingo::registerInputEvent(LEvent event) {
 				_eventQueue.push(LingoEvent(kEventNone, kFrameScript, sprite->_scriptId, spriteId));
 		} else {
 			if (queueEventNone)
-				_eventQueue.push(LingoEvent(kEventNone, kSpriteScript, sprite->_castId + score->_castIDoffset));
-			_eventQueue.push(LingoEvent(event, kSpriteScript, sprite->_castId + score->_castIDoffset));
+				_eventQueue.push(LingoEvent(kEventNone, kSpriteScript, sprite->_castId));
+			_eventQueue.push(LingoEvent(event, kSpriteScript, sprite->_castId));
 		}
 	}
 
diff --git a/engines/director/score-loading.cpp b/engines/director/score-loading.cpp
index 9afbdc5433..d1b4c36815 100644
--- a/engines/director/score-loading.cpp
+++ b/engines/director/score-loading.cpp
@@ -208,7 +208,7 @@ bool Score::loadArchive(bool isSharedCast) {
 		debugC(2, kDebugLoading, "****** Loading %d CastInfos VWCI", vwci.size());
 
 		for (Common::Array<uint16>::iterator iterator = vwci.begin(); iterator != vwci.end(); ++iterator) {
-			loadCastInfo(*(r = _movieArchive->getResource(MKTAG('V', 'W', 'C', 'I'), *iterator)), *iterator);
+			loadCastInfo(*(r = _movieArchive->getResource(MKTAG('V', 'W', 'C', 'I'), *iterator)), *iterator - _castIDoffset);
 			delete r;
 		}
 	}