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

moralrecordings noreply at scummvm.org
Sun Dec 3 11:11:03 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:
b6f09d4152 DIRECTOR: Make b_getNthFileNameInFolder return "" on no match


Commit: b6f09d41522f5d7f978f5ca6c4d49fa5203b89c8
    https://github.com/scummvm/scummvm/commit/b6f09d41522f5d7f978f5ca6c4d49fa5203b89c8
Author: Scott Percival (code at moral.net.au)
Date: 2023-12-03T19:10:59+08:00

Commit Message:
DIRECTOR: Make b_getNthFileNameInFolder return "" on no match

The correct behaviour in Director, when polling getNthFileNameInFolder
with an index higher than the number of available files, is to return an
empty string. Previously our equality logic would coerce VOID to be
equal to "", which is not correct, and disguised the issue of us
returning VOID in b_getNthFileNameInFolder.

Fixes startup sequence in Team Xtreme: Operation Weather Disaster.

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


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index cb7089337f7..78f5a440177 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1222,7 +1222,7 @@ void LB::b_getNthFileNameInFolder(int nargs) {
 			break;
 	}
 
-	Datum r;
+	Datum r("");
 	Common::Array<Common::String> fileNameList;
 
 	// First, mix in any files injected from the quirks




More information about the Scummvm-git-logs mailing list