[Scummvm-git-logs] scummvm master -> 583de6c5e35ad80a239b8ec0fbbd1bceb5bc76cc
sev-
noreply at scummvm.org
Sat Jun 27 22:09:46 UTC 2026
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
f06510e21b DIRECTOR: Check file extension from the end of the file name
62d6a4097d DIRECTOR: Clarify the unknown field in cast member data
f2cb33fe67 DIRECTOR: Parse external cast flag
4da5c7334f DIRECTOR: Clarified more castmemberinfo fields
8d7aea87c0 DIRECTOR: Parse Xtra castmember data
583de6c5e3 DIRECTOR: Added D7 string comparison and order tables. Courtesy of Laria
Commit: f06510e21b3ec6ff7322aa96d4d3361243e7aa5f
https://github.com/scummvm/scummvm/commit/f06510e21b3ec6ff7322aa96d4d3361243e7aa5f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-06-28T00:09:24+02:00
Commit Message:
DIRECTOR: Check file extension from the end of the file name
Changed paths:
engines/director/detection.cpp
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 60ec9bfb995..e058d57a40e 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -355,7 +355,7 @@ ADDetectedGame DirectorMetaEngineDetection::fallbackDetect(const FileMap &allFil
if (ConfMan.hasKey("start_movie")) {
// Check if the start movie is in MacBinary format
- if (ConfMan.get("start_movie").hasPrefixIgnoreCase(".exe")) {
+ if (ConfMan.get("start_movie").hasSuffixIgnoreCase(".exe")) {
warning("Director fallback detection: Start movie has .exe extension, reporting as Windows Director game");
desc->desc.platform = Common::kPlatformWindows;
return ADDetectedGame(&desc->desc);
@@ -404,7 +404,7 @@ ADDetectedGame DirectorMetaEngineDetection::fallbackDetect(const FileMap &allFil
f.seek(0);
uint32 initialTag = f.readUint32BE();
- if (ConfMan.get("start_movie").hasPrefixIgnoreCase(".mmm")) {
+ if (ConfMan.get("start_movie").hasSuffixIgnoreCase(".mmm")) {
desc->version = 200;
} else {
desc->version = 400; // We start from 400, and then the VWCF file will tell us the actual version
Commit: 62d6a4097d5d56c25ad068c465eeb56c7884c61d
https://github.com/scummvm/scummvm/commit/62d6a4097d5d56c25ad068c465eeb56c7884c61d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-06-28T00:09:25+02:00
Commit Message:
DIRECTOR: Clarify the unknown field in cast member data
Changed paths:
engines/director/castmember/transition.cpp
engines/director/castmember/transition.h
diff --git a/engines/director/castmember/transition.cpp b/engines/director/castmember/transition.cpp
index 67801162134..078e419584a 100644
--- a/engines/director/castmember/transition.cpp
+++ b/engines/director/castmember/transition.cpp
@@ -32,6 +32,7 @@ TransitionCastMember::TransitionCastMember(Cast *cast, uint16 castId, Common::Se
_type = kCastTransition;
_transType = kTransNone;
+ _transTime = 0;
_durationMillis = 0;
_chunkSize = 0;
_area = false;
@@ -40,13 +41,13 @@ TransitionCastMember::TransitionCastMember(Cast *cast, uint16 castId, Common::Se
stream.hexdump(stream.size());
}
if (_cast->_version < kFileVer1100) {
- stream.readByte();
+ _transTime = stream.readByte();
_chunkSize = stream.readByte();
_transType = static_cast<TransitionType>(stream.readByte());
_flags = stream.readByte();
_area = !(_flags & 1);
_durationMillis = stream.readUint16BE();
- debugC(3, kDebugLoading, " TransitionCastMember: transType: %d, durationMillis: %d, flags: %d, chunkSize: %d, area: %d", _transType, _durationMillis, _flags, _chunkSize, _area);
+ debugC(3, kDebugLoading, " TransitionCastMember: transTime: %d, transType: %d, durationMillis: %d, flags: %d, chunkSize: %d, area: %d", _transTime, _transType, _durationMillis, _flags, _chunkSize, _area);
} else {
warning("STUB: TransitionCastMember::TransitionCastMember(): Transitions not yet supported for version v%d (%d)", humanVersion(_cast->_version), _cast->_version);
}
@@ -57,6 +58,7 @@ TransitionCastMember::TransitionCastMember(Cast *cast, uint16 castId, Transition
_transType = source._transType;
_loaded = source._loaded;
+ _transTime = source._transTime;
_durationMillis = source._durationMillis;
_flags = source._flags;
_chunkSize = source._chunkSize;
@@ -122,7 +124,7 @@ void TransitionCastMember::setField(int field, const Datum &d) {
}
Common::String TransitionCastMember::formatInfo() {
- return Common::String::format("transType: %d, durationMillis: %d, flags: %d, chunkSize: %d, area: %d", _transType, _durationMillis, _flags, _chunkSize, _area);
+ return Common::String::format("transType: %d, transTime: %d, durationMillis: %d, flags: %d, chunkSize: %d, area: %d", _transType, _transTime, _durationMillis, _flags, _chunkSize, _area);
}
uint32 TransitionCastMember::getCastDataSize() {
@@ -141,7 +143,7 @@ uint32 TransitionCastMember::getCastDataSize() {
void TransitionCastMember::writeCastData(Common::SeekableWriteStream *writeStream) {
if (_cast->_version >= kFileVer400 && _cast->_version < kFileVer1100) {
- writeStream->writeByte(0);
+ writeStream->writeByte(_transTime);
writeStream->writeByte(_chunkSize);
writeStream->writeByte((uint8)_transType);
writeStream->writeByte(_flags);
diff --git a/engines/director/castmember/transition.h b/engines/director/castmember/transition.h
index 0cffaa27b86..e1585c062e0 100644
--- a/engines/director/castmember/transition.h
+++ b/engines/director/castmember/transition.h
@@ -42,6 +42,7 @@ public:
uint32 getCastDataSize() override;
void writeCastData(Common::SeekableWriteStream *writeStream) override;
+ uint8 _transTime;
TransitionType _transType;
uint16 _durationMillis;
uint8 _flags;
Commit: f2cb33fe67ba400036450a567fee49118fac0b67
https://github.com/scummvm/scummvm/commit/f2cb33fe67ba400036450a567fee49118fac0b67
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-06-28T00:09:25+02:00
Commit Message:
DIRECTOR: Parse external cast flag
Changed paths:
engines/director/cast.cpp
engines/director/castmember/castmember.h
engines/director/debugger/dt-castdetails.cpp
diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 7f403b7cd5e..fe7e9fec787 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -2148,6 +2148,7 @@ void Cast::loadCastInfo(Common::SeekableReadStreamEndian &stream, uint16 id) {
if (member->_type == kCastPalette)
member->load();
+ ci->isExternal = castInfo.flags & 1;
ci->autoHilite = castInfo.flags & 2;
ci->scriptId = castInfo.scriptId;
if (ci->scriptId != 0)
diff --git a/engines/director/castmember/castmember.h b/engines/director/castmember/castmember.h
index ec958c27849..964e697a944 100644
--- a/engines/director/castmember/castmember.h
+++ b/engines/director/castmember/castmember.h
@@ -167,6 +167,7 @@ struct CastMemberInfo {
uint32 flags;
uint16 count;
bool autoHilite;
+ bool isExternal;
uint32 scriptId;
// List items
@@ -197,6 +198,7 @@ struct CastMemberInfo {
CastMemberInfo() : autoHilite(false), scriptId(0) {
memset(xtraGuid, 0, 16);
memset(guid, 0, 16);
+ isExternal = false;
creationTime = 0;
modifiedTime = 0;
imageQuality = 0;
diff --git a/engines/director/debugger/dt-castdetails.cpp b/engines/director/debugger/dt-castdetails.cpp
index 03ee4681a2d..88ee550b014 100644
--- a/engines/director/debugger/dt-castdetails.cpp
+++ b/engines/director/debugger/dt-castdetails.cpp
@@ -103,8 +103,10 @@ void drawBitmapCMprops(BitmapCastMember *member) {
if (ImGui::BeginTable("##BitmapPlaybackProperties", 2, ImGuiTableFlags_RowBg | ImGuiTableFlags_Borders)) {
if (info == nullptr) {
+ showProperty("isExternal", "No Info");
showProperty("autohilite", "No Info");
} else {
+ showPropertyBool("isExternal", info->isExternal);
showPropertyBool("autoHilite", info->autoHilite);
}
Commit: 4da5c7334fc0d165166857c4d73611a553095d3a
https://github.com/scummvm/scummvm/commit/4da5c7334fc0d165166857c4d73611a553095d3a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-06-28T00:09:25+02:00
Commit Message:
DIRECTOR: Clarified more castmemberinfo fields
Changed paths:
engines/director/cast.cpp
diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index fe7e9fec787..95f06cc2042 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -2008,22 +2008,20 @@ void Cast::loadCastInfo(Common::SeekableReadStreamEndian &stream, uint16 id) {
// fallthrough
case 12:
if (castInfo.strings[12].len) {
- warning("Cast::loadCastInfo(): BUILDBOT: xtraRect for castid %d", id);
Common::hexdump(castInfo.strings[12].data, castInfo.strings[12].len);
ci->xtraRect.top = READ_BE_INT32(castInfo.strings[12].data);
ci->xtraRect.left = READ_BE_INT32(castInfo.strings[12].data + 4);
ci->xtraRect.bottom = READ_BE_INT32(castInfo.strings[12].data + 8);
ci->xtraRect.right = READ_BE_INT32(castInfo.strings[12].data + 12);
- dumpS = "xtraRect: <data>, " + dumpS;
+ dumpS = Common::String::format("xtraRect: [%d,%d,%d,%d], ", ci->xtraRect.left, ci->xtraRect.top, ci->xtraRect.right, ci->xtraRect.bottom) + dumpS;
}
// fallthrough
case 11:
if (castInfo.strings[11].len) {
- warning("Cast::loadCastInfo(): BUILDBOT: bptable for castid %d", id);
- Common::hexdump(castInfo.strings[11].data, castInfo.strings[11].len);
+ // Breakpoints table, used only by the Authoring
ci->bpTable = Common::Array<byte>(castInfo.strings[11].data, castInfo.strings[11].len);
- dumpS = "bpTable: <data>, " + dumpS;
+ dumpS = Common::String::format("bpTable: <data %d bytes>, ", ci->bpTable.size()) + dumpS;
}
// fallthrough
case 10:
Commit: 8d7aea87c0cfcba46967e6c5d3b1ee75281a7980
https://github.com/scummvm/scummvm/commit/8d7aea87c0cfcba46967e6c5d3b1ee75281a7980
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-06-28T00:09:26+02:00
Commit Message:
DIRECTOR: Parse Xtra castmember data
Not that there is much to parse, all the details go into
the actual Xtra
Changed paths:
engines/director/castmember/xtra.cpp
engines/director/castmember/xtra.h
diff --git a/engines/director/castmember/xtra.cpp b/engines/director/castmember/xtra.cpp
index 7ebcee818b3..b005af652cd 100644
--- a/engines/director/castmember/xtra.cpp
+++ b/engines/director/castmember/xtra.cpp
@@ -35,6 +35,30 @@ XtraCastMember::XtraCastMember(Cast *cast, uint16 castId, Common::SeekableReadSt
stream.hexdump(stream.size());
}
+ 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);
+
+ // TODO: Lookup synmbol
+
+ 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);
+ }
+
+ // TODO: Process data in the Xtra
+ }
+
warning("STUB: XtraCastMember::XtraCastMember(): Xtra cast members not yet supported for version v%d (%d)", humanVersion(_cast->_version), _cast->_version);
}
diff --git a/engines/director/castmember/xtra.h b/engines/director/castmember/xtra.h
index 1ad458ffbb5..efeaf836638 100644
--- a/engines/director/castmember/xtra.h
+++ b/engines/director/castmember/xtra.h
@@ -41,6 +41,10 @@ public:
uint32 getCastDataSize() override;
void writeCastData(Common::SeekableWriteStream *writeStream) override;
+
+private:
+ Common::String _xtraSymbol;
+ Common::Array<byte> _xtraData;
};
} // End of namespace Director
Commit: 583de6c5e35ad80a239b8ec0fbbd1bceb5bc76cc
https://github.com/scummvm/scummvm/commit/583de6c5e35ad80a239b8ec0fbbd1bceb5bc76cc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-06-28T00:09:26+02:00
Commit Message:
DIRECTOR: Added D7 string comparison and order tables. Courtesy of Laria
Changed paths:
engines/director/util.cpp
diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 6aaa3001db0..f30a168faf7 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -1478,7 +1478,6 @@ const byte orderTableD2mac[256] = {
// ��������������������������������
// ������ӬÔÕ®ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ü¦Ý ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½.
-
const byte orderTableD4Jmac[256] = {
0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b,
0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b,
@@ -1533,10 +1532,10 @@ const byte orderTableD4win[256] = {
//
// Director 6.0 Win, cp1252 encoding
//
-// ............................����
-// �'-Âââ  .....!"#$%&()*,./:;?@[\]
-// ^Ë_`{|}~¡¦¨¯´¸¿Ëâââââââ¹âº+<=>±«»Ã
-// ÷¢£¤¥§©¬®°µ¶·â â¡â¢â¦â°â¬0¼½¾1¹2²3³456
+// ............................'-â
+// â Â .....!"#$%&()*,./:;?@[\]Ë._`{
+// |}~¡¦¨¯´¸¿Ëâââââââ¹âºÂ¢Â£Â¤Â¥â¬+<=>±«»Ã
+// ÷§©¬®°µ¶·â¦â â¡â¢â°ï¿½ï¿½ï¿½ï¿½ï¿½0¼½¾1¹2²3³456
// 789aAªáÃà ÃâÃäÃãÃÃ¥Ã
æÃbBcCçÃdDðÃeE
// éÃèÃêÃëÃfFÆgGhHiIÃÃìÃîÃïÃjJkKlLm
// MnNñÃoOºóÃòÃôÃöÃõÃøÃÅÅpPqQrRsSÅ¡Å
@@ -1561,6 +1560,36 @@ const byte orderTableD6win[256] = {
0x9c, 0xc3, 0xca, 0xc8, 0xcc, 0xd0, 0xce, 0x60, 0xd2, 0xea, 0xe8, 0xec, 0xee, 0xf8, 0xe3, 0xfa,
};
+//
+// Director 7.0 Win, cp1252 encoding
+//
+// ............................'-â
+// â Â .....!"#$%&()*,./:;?@[\]Ë._`{
+// |}~¡¦¨¯´¸¿Ëâââââââ¹âºÂ¢Â£Â¤Â¥â¬+<=>±«»Ã
+// ÷§©¬®°µ¶·â¦â â¡â¢â°ï¿½ï¿½ï¿½ï¿½ï¿½0¼½¾1¹2²3³456
+// 789aAªáÃà ÃâÃäÃãÃÃ¥Ã
æÃbBcCçÃdDðÃeE
+// éÃèÃêÃëÃfFÆgGhHiIÃÃìÃîÃïÃjJkKlLm
+// MnNñÃoOºóÃòÃôÃöÃõÃøÃÅÅpPqQrRsSÅ¡Å
+// ÃtTþÃâ¢uUúÃùÃûÃüÃvVwWxXyYýÃ.ŸzZžŽ
+
+const byte orderTableD7win[256] = {
+ 0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x23, 0x24, 0x25, 0x26, 0x27, 0x0a, 0x0b,
+ 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b,
+ 0x21, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x1d, 0x2e, 0x2f, 0x30, 0x4d, 0x31, 0x1e, 0x32, 0x33,
+ 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x34, 0x35, 0x4e, 0x4f, 0x50, 0x36,
+ 0x37, 0x6d, 0x6f, 0x71, 0x73, 0x75, 0x77, 0x79, 0x7b, 0x7d, 0x7f, 0x81, 0x83, 0x85, 0x87, 0x8a,
+ 0x8c, 0x8e, 0x90, 0x92, 0x94, 0x97, 0x99, 0x9b, 0x9d, 0x9f, 0xa1, 0x38, 0x39, 0x3a, 0x3b, 0x3c,
+ 0x3d, 0x6c, 0x6e, 0x70, 0x72, 0x74, 0x76, 0x78, 0x7a, 0x7c, 0x7e, 0x80, 0x82, 0x84, 0x86, 0x89,
+ 0x8b, 0x8d, 0x8f, 0x91, 0x93, 0x96, 0x98, 0x9a, 0x9c, 0x9e, 0xa0, 0x3e, 0x3f, 0x40, 0x41, 0x1c,
+ 0xb1, 0xab, 0x45, 0xaa, 0x48, 0x5c, 0x5d, 0x5e, 0x4c, 0x60, 0xcf, 0x49, 0xd5, 0xcb, 0xe1, 0xef,
+ 0xb0, 0x43, 0x44, 0x46, 0x47, 0x5f, 0x1f, 0x20, 0x61, 0x95, 0xce, 0x4a, 0xd4, 0xca, 0xe0, 0xee,
+ 0x22, 0xe5, 0xe4, 0xc7, 0x4b, 0xad, 0x42, 0x54, 0xb5, 0x55, 0xb7, 0x52, 0x56, 0x00, 0x57, 0xc5,
+ 0x58, 0x51, 0xc3, 0xc2, 0xac, 0x59, 0x5a, 0x5b, 0xb4, 0x88, 0xb6, 0x53, 0xc6, 0xbd, 0xbc, 0xc4,
+ 0xa3, 0xa5, 0xa7, 0xa9, 0xaf, 0xb3, 0xb9, 0xbb, 0xbf, 0xc1, 0xc9, 0xcd, 0xd1, 0xd3, 0xd7, 0xd9,
+ 0xdb, 0xdd, 0xdf, 0xe3, 0xe7, 0xe9, 0xeb, 0xed, 0xf1, 0xf3, 0xf5, 0xf7, 0xf9, 0xfb, 0xfd, 0xff,
+ 0xa2, 0xa4, 0xa6, 0xa8, 0xae, 0xb2, 0xb8, 0xba, 0xbe, 0xc0, 0xc8, 0xcc, 0xd0, 0xd2, 0xd6, 0xd8,
+ 0xda, 0xdc, 0xde, 0xe2, 0xe6, 0xe8, 0xea, 0xec, 0xf0, 0xf2, 0xf4, 0xf6, 0xf8, 0xfa, 0xfc, 0xfe,
+};
//
// Director 8.5 Mac, MacRoman encoding
@@ -1689,7 +1718,7 @@ const byte equalityTableD5win[256] = {
//
-// Director 6 Win, cp1252 encoding
+// Director 6 Win, Director 7 win, cp1252 encoding
//
const byte equalityTableD6win[256] = {
@@ -1781,6 +1810,9 @@ static int getCharOrder(Common::u32char_type_t ch) {
if (pl == Common::kPlatformWindows && lang != Common::JA_JPN && version < 700)
return orderTableD6win[num];
+ if (pl == Common::kPlatformWindows && lang != Common::JA_JPN && version < 800)
+ return orderTableD7win[num];
+
if (pl == Common::kPlatformMacintosh && lang != Common::JA_JPN && version < 900)
return orderTableD8mac[num];
@@ -1834,7 +1866,7 @@ static int getCharEquality(Common::u32char_type_t ch) {
if (pl == Common::kPlatformWindows && lang != Common::JA_JPN && version < 600)
return equalityTableD5win[num];
- if (pl == Common::kPlatformWindows && lang != Common::JA_JPN && version < 700)
+ if (pl == Common::kPlatformWindows && lang != Common::JA_JPN && version < 800)
return equalityTableD6win[num];
warning("BUILDBOT: No equality table for Director version: %d-%s", version, Common::getLanguageCode(lang));
More information about the Scummvm-git-logs
mailing list