[Scummvm-git-logs] scummvm master -> a3db1e931532b897896180f50e395ceb80406841

[sev-]

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

Summary:
1f18790b79 DIRECTOR: Clarify the `field` keyword
a3db1e9315 DIRECTOR: XLIBS: Fix path resolving in MapNavigatorXObj


Commit: 1f18790b7927952351a067d84930b34fe787f72b
    https://github.com/scummvm/scummvm/commit/1f18790b7927952351a067d84930b34fe787f72b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-06-06T01:12:57+02:00

Commit Message:
DIRECTOR: Clarify the `field` keyword

It is meant to refer only to the text cast members. Without this
restriction, we try loading first cast member with the matching name.

This fixes startup in jewels1, where a script cast member and a text
cast member both have name "nullMouseUpScript" in "CIPHER/NAVLOAD.DXR"

Changed paths:
    engines/director/lingo/lingo-the.cpp


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index c1ac922028f..211dfe71ada 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -2314,7 +2314,7 @@ Datum Lingo::getTheField(Datum &id1, int field) {
 		return d;
 	}
 
-	CastMemberID id = id1.asMemberID();
+	CastMemberID id = id1.asMemberID(kCastText);
 
 	CastMember *member = movie->getCastMember(id);
 	if (!member) {


Commit: a3db1e931532b897896180f50e395ceb80406841
    https://github.com/scummvm/scummvm/commit/a3db1e931532b897896180f50e395ceb80406841
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-06-06T01:27:34+02:00

Commit Message:
DIRECTOR: XLIBS: Fix path resolving in MapNavigatorXObj

Fixes the XObj instantiation in jewels1

Changed paths:
    engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp


diff --git a/engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp b/engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp
index c6e8381a5d6..48056929149 100644
--- a/engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp
+++ b/engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp
@@ -145,7 +145,9 @@ void MapNavigatorXObj::m_new(int nargs) {
 	me->_filename = g_lingo->pop().asString();
 	Common::File file;
 
-	if (!file.open(Common::Path(me->_filename))) {
+	Common::Path resPath = findPath(me->_filename, true, true, false);
+
+	if (!file.open(resPath)) {
 		warning("MapNavigatorXObj::m_new(): Cannot open file %s", me->_filename.c_str());
 		g_lingo->push(g_lingo->_state->me);
 		return;