[Scummvm-git-logs] scummvm master -> 8f2379bd79bb4ab62a2f4f25ee58d40509e9f259

[sev-]

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:
8f2379bd79 DIRECTOR: LINGO: Added stub for custom cursors


Commit: 8f2379bd79bb4ab62a2f4f25ee58d40509e9f259
    https://github.com/scummvm/scummvm/commit/8f2379bd79bb4ab62a2f4f25ee58d40509e9f259
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T00:02:34+01:00

Commit Message:
DIRECTOR: LINGO: Added stub for custom cursors

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


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index ae6b60c..7c66d57 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1064,9 +1064,19 @@ void LB::b_clearGlobals(int nargs) {
 }
 
 void LB::b_cursor(int nargs) {
+	int mask = -1;
+
 	Datum d = g_lingo->pop();
 	d.toInt();
-	g_lingo->func_cursor(d.u.i);
+
+	if (nargs == 2) {
+		d = g_lingo->pop();
+		d.toInt();
+
+		mask = d.u.i;
+	}
+
+	g_lingo->func_cursor(d.u.i, mask);
 }
 
 void LB::b_showGlobals(int nargs) {
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index 4a962dc..869e343 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -326,12 +326,17 @@ void Lingo::func_playdone() {
 	func_goto(f, m);
 }
 
-void Lingo::func_cursor(int c) {
+void Lingo::func_cursor(int c, int mask) {
 	if (_cursorOnStack) {
 		// pop cursor
 		_vm->getMacWindowManager()->popCursor();
 	}
 
+	if (mask != -1) {
+		warning("STUB: func_cursor(%d, %d)", c, mask);
+		return;
+	}
+
 	// and then push cursor.
 	switch (c) {
 	case 0:
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index 337099d..2f9dfd0 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -256,7 +256,7 @@ public:
 	void func_gotoprevious();
 	void func_play(Datum &frame, Datum &movie);
 	void func_playdone();
-	void func_cursor(int c);
+	void func_cursor(int c, int mask);
 	int func_marker(int m);
 
 	// lingo-the.cpp