[Scummvm-git-logs] scummvm master -> 5b584d1fb67a3da195ab8595ea1bf4f19df45cab

[sev-]

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

Summary:
914355c92b DIRECTOR: LINGO: findPos() should return VOID when item is not found
5b584d1fb6 DIRECTOR: LINGO: Fix Lingo test for (list - list) operation


Commit: 914355c92b69788ad348b5233899264a13edd098
    https://github.com/scummvm/scummvm/commit/914355c92b69788ad348b5233899264a13edd098
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-23T18:22:02+01:00

Commit Message:
DIRECTOR: LINGO: findPos() should return VOID when item is not found

This fixes (partially) trekguidetng startup.

Also implement the relevant test

Changed paths:
    engines/director/lingo/lingo-builtins.cpp
    engines/director/lingo/tests/lists.lingo


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index a3e798c703f..26028e94506 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -785,7 +785,7 @@ void LB::b_duplicateList(int nargs) {
 void LB::b_findPos(int nargs) {
 	Datum prop = g_lingo->pop();
 	Datum list = g_lingo->pop();
-	Datum d(0);
+	Datum d(g_lingo->getVoid());
 	TYPECHECK(list, PARRAY);
 
 	int index = LC::compareArrays(LC::eqData, list, prop, true).u.i;
diff --git a/engines/director/lingo/tests/lists.lingo b/engines/director/lingo/tests/lists.lingo
index abad9c1a9ed..dd3941aeaee 100644
--- a/engines/director/lingo/tests/lists.lingo
+++ b/engines/director/lingo/tests/lists.lingo
@@ -228,7 +228,9 @@ scummvmAssertEqual(testList, [5, "URGH", 3, 1])
 
 
 -- findPos
-
+set testList to [#a: 1, #b: 2, #c: 3, #d: 4, #e: 5]
+scummvmAssertEqual(findPos(testList, #b), 2)
+scummvmAssertEqual(findPos(testList, #f), VOID)
 
 -- findPosNear
 


Commit: 5b584d1fb67a3da195ab8595ea1bf4f19df45cab
    https://github.com/scummvm/scummvm/commit/5b584d1fb67a3da195ab8595ea1bf4f19df45cab
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-23T18:22:32+01:00

Commit Message:
DIRECTOR: LINGO: Fix Lingo test for (list - list) operation

Changed paths:
    engines/director/lingo/tests/lists.lingo


diff --git a/engines/director/lingo/tests/lists.lingo b/engines/director/lingo/tests/lists.lingo
index dd3941aeaee..7471885ad48 100644
--- a/engines/director/lingo/tests/lists.lingo
+++ b/engines/director/lingo/tests/lists.lingo
@@ -13,7 +13,7 @@ set gBugList = [[energy: 10, mood: "Happy"], [energy: -10, mood: "Sad"], [energy
 
 set b to [4, 5, 6, 7]
 scummvmAssertEqual(string(a + b), "[5, 7, 9]")
-scummvmAssertEqual(string(a - b), "[3, 3, 3]")
+scummvmAssertEqual(string(a - b), "[-3, -3, -3]")
 scummvmAssertEqual(string(a * b), "[4, 10, 18]")
 scummvmAssertEqual(string(b / a), "[4, 2, 2]")
 scummvmAssertEqual(string(b mod a), "[0, 1, 0]")