[Scummvm-git-logs] scummvm master -> 9b9d02e2092a1dc4cee2020ee70735a70b7d1f15

[rvanlaar]

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:
9b9d02e209 DIRECTOR: LINGO: XOBJ: STUB readPict in FileIO


Commit: 9b9d02e2092a1dc4cee2020ee70735a70b7d1f15
    https://github.com/scummvm/scummvm/commit/9b9d02e2092a1dc4cee2020ee70735a70b7d1f15
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-09-07T12:09:29+02:00

Commit Message:
DIRECTOR: LINGO: XOBJ: STUB readPict in FileIO

C.H.A.O.S. Continuum got stuck when trying to read PICT files. Now the
game interface will still react to user input.

Stubbing readPict makes lingo code not error out and continue.
The underlying `set the picture for cast` is already stubbed.

Changed paths:
    engines/director/lingo/xlibs/fileio.cpp
    engines/director/lingo/xlibs/fileio.h


diff --git a/engines/director/lingo/xlibs/fileio.cpp b/engines/director/lingo/xlibs/fileio.cpp
index b3ee01ff1f8..7b8f405999b 100644
--- a/engines/director/lingo/xlibs/fileio.cpp
+++ b/engines/director/lingo/xlibs/fileio.cpp
@@ -49,6 +49,7 @@ static MethodProto xlibMethods[] = {
 	{ "readFile",				FileIO::m_readFile,			 0, 0,	200 },	// D2
 	{ "readLine",				FileIO::m_readLine,			 0, 0,	200 },	// D2
 	{ "readToken",				FileIO::m_readToken,		 2, 2,	200 },	// D2
+	{ "readPict",				FileIO::m_readPict,			 0,	0,	300 },  // D3
 	{ "readWord",				FileIO::m_readWord,			 0, 0,	200 },	// D2
 	{ "setFinderInfo",			FileIO::m_setFinderInfo,	 2, 2,	200 },	// D2
 	{ "setPosition",			FileIO::m_setPosition,		 1, 1,	200 },	// D2
@@ -260,6 +261,11 @@ void FileIO::m_readWord(int nargs) {
 	FileIO::m_readToken(2);
 }
 
+void FileIO::m_readPict(int nargs) {
+	g_lingo->printSTUBWithArglist("FileIO::m_readPict", nargs);
+	g_lingo->push(Datum(""));
+}
+
 bool FileIO::charInMatchString(char ch, const Common::String &matchString) {
 	if (ch == '\r')
 		ch = '\n';
diff --git a/engines/director/lingo/xlibs/fileio.h b/engines/director/lingo/xlibs/fileio.h
index 941052f585c..e0a19ba62e4 100644
--- a/engines/director/lingo/xlibs/fileio.h
+++ b/engines/director/lingo/xlibs/fileio.h
@@ -86,6 +86,7 @@ namespace FileIO {
 	void m_readChar(int nargs);
 	void m_readFile(int nargs);
 	void m_readLine(int nargs);
+	void m_readPict(int nargs);
 	void m_readToken(int nargs);
 	void m_readWord(int nargs);
 	void m_setFinderInfo(int nargs);