[Scummvm-git-logs] scummvm master -> 249e97e724eb4d8d621575767167593afc5e11b9

[sev-]

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

Summary:
249e97e724 DIRECTOR: Include Xtra symbol and cast id in XtraCastMember stub warnings


Commit: 249e97e724eb4d8d621575767167593afc5e11b9
    https://github.com/scummvm/scummvm/commit/249e97e724eb4d8d621575767167593afc5e11b9
Author: Gianluca Boiano (morf3089 at gmail.com)
Date: 2026-07-18T23:15:11+02:00

Commit Message:
DIRECTOR: Include Xtra symbol and cast id in XtraCastMember stub warnings

External members now emit a single warning naming the member instead
of a second one with an empty symbol.

Changed paths:
    engines/director/castmember/xtra.cpp


diff --git a/engines/director/castmember/xtra.cpp b/engines/director/castmember/xtra.cpp
index f714247b6f2..a6a41b7f5be 100644
--- a/engines/director/castmember/xtra.cpp
+++ b/engines/director/castmember/xtra.cpp
@@ -70,24 +70,27 @@ XtraCastMember::XtraCastMember(Cast *cast, uint16 castId, Common::SeekableReadSt
 	CastMemberInfo *ci = getInfo();
 
 	if (ci && ci->isExternal) {
-		warning("STUB: XtraCastMember::XtraCastMember(): External Xtra cast members not yet supported for version v%d (%d)", humanVersion(_cast->_version), _cast->_version);
-	} else {
-		uint32 symbolLen = stream.readUint32BE();
-		_xtraSymbol = stream.readString(0, symbolLen);
-		uint32 xtraDataLen = stream.readUint32BE();
-		xtraDataLen = MIN<int>(xtraDataLen, (int)(stream.size() - stream.pos()));
-		_xtraData = Common::Array<byte>(xtraDataLen);
-		stream.read(_xtraData.data(), xtraDataLen);
-
-		debugC(3, kDebugLoading, "  XtraCastMember: xtraSymbol: '%s', xtraDataLen: %d", _xtraSymbol.c_str(), xtraDataLen);
-
-		if (debugChannelSet(5, kDebugLoading)) {
-			Common::hexdump(_xtraData.data(), xtraDataLen);
-		}
+		warning("STUB: XtraCastMember::XtraCastMember(): External Xtra cast member %d ('%s', display name '%s') not yet supported for version v%d (%d)",
+				castId, ci->name.c_str(), ci->xtraDisplayName.c_str(), humanVersion(_cast->_version), _cast->_version);
+		return;
+	}
+
+	uint32 symbolLen = stream.readUint32BE();
+	_xtraSymbol = stream.readString(0, symbolLen);
+	uint32 xtraDataLen = stream.readUint32BE();
+	xtraDataLen = MIN<int>(xtraDataLen, (int)(stream.size() - stream.pos()));
+	_xtraData = Common::Array<byte>(xtraDataLen);
+	stream.read(_xtraData.data(), xtraDataLen);
+
+	debugC(3, kDebugLoading, "  XtraCastMember: xtraSymbol: '%s', xtraDataLen: %d", _xtraSymbol.c_str(), xtraDataLen);
+
+	if (debugChannelSet(5, kDebugLoading)) {
+		Common::hexdump(_xtraData.data(), xtraDataLen);
 	}
 
 	if (!findXtraCastMemberProto(_xtraSymbol))
-		warning("STUB: XtraCastMember::XtraCastMember(): Xtra cast members not yet supported for version v%d (%d)", humanVersion(_cast->_version), _cast->_version);
+		warning("STUB: XtraCastMember::XtraCastMember(): Xtra '%s' cast member %d not yet supported for version v%d (%d)",
+				_xtraSymbol.c_str(), castId, humanVersion(_cast->_version), _cast->_version);
 }
 
 XtraCastMember::XtraCastMember(Cast *cast, uint16 castId, XtraCastMember &source)