[Scummvm-git-logs] scummvm master -> 4ab38721ce3e57a7174d12d017bdb6679f635153

[sev-]

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:
4ab38721ce DIRECTOR: Load CastInfo for the Shared Cast


Commit: 4ab38721ce3e57a7174d12d017bdb6679f635153
    https://github.com/scummvm/scummvm/commit/4ab38721ce3e57a7174d12d017bdb6679f635153
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-01T22:41:07+01:00

Commit Message:
DIRECTOR: Load CastInfo for the Shared Cast

Changed paths:
    engines/director/resource.cpp
    engines/director/score.h


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index 3db6d66..6dace8b 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -231,6 +231,12 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
 			_sharedScore->loadCastData(*shardcst->getResource(MKTAG('C','A','S','t'), *iterator), *iterator, NULL);
 	}
 
+	Common::Array<uint16> vwci = shardcst->getResourceIDList(MKTAG('V', 'W', 'C', 'I'));
+	if (vwci.size() > 0) {
+		for (Common::Array<uint16>::iterator iterator = vwci.begin(); iterator != vwci.end(); ++iterator)
+			_sharedScore->loadCastInfo(*shardcst->getResource(MKTAG('V', 'W', 'C', 'I'), *iterator), *iterator);
+	}
+
 	_sharedScore->setSpriteCasts();
 
 	Common::Array<uint16> dib = shardcst->getResourceIDList(MKTAG('D','I','B',' '));
diff --git a/engines/director/score.h b/engines/director/score.h
index 9ffa0e4..0a51d65 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -72,6 +72,7 @@ public:
 	void loadConfig(Common::SeekableSubReadStreamEndian &stream);
 	void loadCastDataVWCR(Common::SeekableSubReadStreamEndian &stream);
 	void loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id, Resource *res);
+	void loadCastInfo(Common::SeekableSubReadStreamEndian &stream, uint16 id);
 	void setCurrentFrame(uint16 frameId) { _currentFrame = frameId; }
 	int getCurrentFrame() { return _currentFrame; }
 	Common::String getMacName() const { return _macName; }
@@ -90,7 +91,6 @@ private:
 	void loadFrames(Common::SeekableSubReadStreamEndian &stream);
 	void loadLabels(Common::SeekableSubReadStreamEndian &stream);
 	void loadActions(Common::SeekableSubReadStreamEndian &stream);
-	void loadCastInfo(Common::SeekableSubReadStreamEndian &stream, uint16 id);
 	void loadScriptText(Common::SeekableSubReadStreamEndian &stream);
 	void loadFileInfo(Common::SeekableSubReadStreamEndian &stream);
 	void loadFontMap(Common::SeekableSubReadStreamEndian &stream);