[Scummvm-git-logs] scummvm master -> 0c92428a0ff80a22ca2203a45affa2690bef8a82

moralrecordings noreply at scummvm.org
Thu Jun 1 03:37:47 UTC 2023


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:
0c92428a0f DIRECTOR: Cast: search for xlib


Commit: 0c92428a0ff80a22ca2203a45affa2690bef8a82
    https://github.com/scummvm/scummvm/commit/0c92428a0ff80a22ca2203a45affa2690bef8a82
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-06-01T11:37:42+08:00

Commit Message:
DIRECTOR: Cast: search for xlib

The shared cast can contain xlibs. Fixes recognizing the xlib in
Journey to the Source.

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index e8db296fded..2a27f4b2834 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -541,6 +541,16 @@ void Cast::loadCast() {
 		delete r;
 	}
 
+
+	if (_castArchive->hasResource(MKTAG('X', 'C', 'O', 'D'), -1)) {
+		Common::Array<uint16> xcod = _castArchive->getResourceIDList(MKTAG('X', 'C', 'O', 'D'));
+		for (Common::Array<uint16>::iterator iterator = xcod.begin(); iterator != xcod.end(); ++iterator) {
+			Resource res = _castArchive->getResourceDetail(MKTAG('X', 'C', 'O', 'D'), *iterator);
+			debug(0, "Detected XObject '%s'", res.name.c_str());
+			g_lingo->openXLib(res.name, kXObj);
+		}
+	}
+
 	Common::Array<uint16> cinf = _castArchive->getResourceIDList(MKTAG('C', 'i', 'n', 'f'));
 	if (cinf.size() > 0) {
 		debugC(2, kDebugLoading, "****** Loading %d CastLibInfos Cinf", cinf.size());




More information about the Scummvm-git-logs mailing list