[Scummvm-git-logs] scummvm master -> 355289c4ffb1d430a557901209f741eeb962e22b

[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:
355289c4ff DIRECTOR: Fix shared cast loading


Commit: 355289c4ffb1d430a557901209f741eeb962e22b
    https://github.com/scummvm/scummvm/commit/355289c4ffb1d430a557901209f741eeb962e22b
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-14T15:11:03-04:00

Commit Message:
DIRECTOR: Fix shared cast loading

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


diff --git a/engines/director/score-loading.cpp b/engines/director/score-loading.cpp
index 8ee265e3d1..208d73fa7b 100644
--- a/engines/director/score-loading.cpp
+++ b/engines/director/score-loading.cpp
@@ -81,19 +81,21 @@ bool Score::loadArchive(bool isSharedCast) {
 	Common::Array<uint16> clutList = _movieArchive->getResourceIDList(MKTAG('C', 'L', 'U', 'T'));
 	Common::SeekableSubReadStreamEndian *r = nullptr;
 
-	if (clutList.size() > 1)
-		warning("More than one palette was found (%d)", clutList.size());
+	if (!isSharedCast) {
+		if (clutList.size() > 1)
+			warning("More than one palette was found (%d)", clutList.size());
 
-	if (clutList.size() == 0) {
-		warning("CLUT resource not found, using default Mac palette");
-		_vm->setPalette(-1);
-	} else {
-		Common::SeekableSubReadStreamEndian *pal = _movieArchive->getResource(MKTAG('C', 'L', 'U', 'T'), clutList[0]);
+		if (clutList.size() == 0) {
+			warning("CLUT resource not found, using default Mac palette");
+			_vm->setPalette(-1);
+		} else {
+			Common::SeekableSubReadStreamEndian *pal = _movieArchive->getResource(MKTAG('C', 'L', 'U', 'T'), clutList[0]);
 
-		debugC(2, kDebugLoading, "****** Loading Palette CLUT, #%d", clutList[0]);
-		loadPalette(*pal);
+			debugC(2, kDebugLoading, "****** Loading Palette CLUT, #%d", clutList[0]);
+			loadPalette(*pal);
 
-		delete pal;
+			delete pal;
+		}
 	}
 
 	// Font Directory
@@ -123,9 +125,11 @@ bool Score::loadArchive(bool isSharedCast) {
 		_stageColor = 1;
 	}
 
-	_window = _vm->_wm->addWindow(false, false, false);
-	_window->disableBorder();
-	_window->resize(_movieRect.width(), _movieRect.height());
+	if (!isSharedCast) {
+		_window = _vm->_wm->addWindow(false, false, false);
+		_window->disableBorder();
+		_window->resize(_movieRect.width(), _movieRect.height());
+	}
 
 	// Cast Information Array
 	if (_movieArchive->hasResource(MKTAG('V', 'W', 'C', 'R'), -1)) {