[Scummvm-git-logs] scummvm master -> 069415c3fe8742fbeaea56e74bef6707a8dc7eb8

[djsrv]

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:
f1fdd40bb7 DIRECTOR: LINGO: Drop stack in stubbed methods
069415c3fe DIRECTOR: LINGO: Fix m_instanceRespondsTo


Commit: f1fdd40bb7a606cec1924aef739b225fdf8e6111
    https://github.com/scummvm/scummvm/commit/f1fdd40bb7a606cec1924aef739b225fdf8e6111
Author: djsrv (dservilla at gmail.com)
Date: 2020-07-07T17:40:30-04:00

Commit Message:
DIRECTOR: LINGO: Drop stack in stubbed methods

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


diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index 26fef19b34..8ecd3cce4a 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -319,22 +319,27 @@ void LM::m_respondsTo(int nargs) {
 
 void LM::m_close(int nargs) {
 	g_lingo->printSTUBWithArglist("m_close", nargs);
+	g_lingo->dropStack(nargs);
 }
 
 void LM::m_forget(int nargs) {
 	g_lingo->printSTUBWithArglist("m_forget", nargs);
+	g_lingo->dropStack(nargs);
 }
 
 void LM::m_open(int nargs) {
 	g_lingo->printSTUBWithArglist("m_open", nargs);
+	g_lingo->dropStack(nargs);
 }
 
 void LM::m_moveToBack(int nargs) {
 	g_lingo->printSTUBWithArglist("m_moveToBack", nargs);
+	g_lingo->dropStack(nargs);
 }
 
 void LM::m_moveToFront(int nargs) {
 	g_lingo->printSTUBWithArglist("m_moveToFront", nargs);
+	g_lingo->dropStack(nargs);
 }
 
 } // End of namespace Director


Commit: 069415c3fe8742fbeaea56e74bef6707a8dc7eb8
    https://github.com/scummvm/scummvm/commit/069415c3fe8742fbeaea56e74bef6707a8dc7eb8
Author: djsrv (dservilla at gmail.com)
Date: 2020-07-07T17:40:30-04:00

Commit Message:
DIRECTOR: LINGO: Fix m_instanceRespondsTo

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


diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index 8ecd3cce4a..bd16bd5461 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -285,7 +285,7 @@ void LM::m_instanceRespondsTo(int nargs) {
 	Datum d = g_lingo->pop();
 	Common::String methodName = d.asString();
 
-	if (g_lingo->_methods.contains(methodName) && (me->getObjType() & g_lingo->_methods[methodName].type)) {
+	if (me->getMethod(methodName).type != VOID) {
 		g_lingo->push(Datum(1));
 	} else {
 		g_lingo->push(Datum(0));
@@ -308,7 +308,7 @@ void LM::m_respondsTo(int nargs) {
 	Common::String methodName = d.asString();
 
 	// TODO: Check inheritance level
-	if (g_lingo->_methods.contains(methodName) && (me->getObjType() & g_lingo->_methods[methodName].type)) {
+	if (me->getMethod(methodName).type != VOID) {
 		g_lingo->push(Datum(1));
 	} else {
 		g_lingo->push(Datum(0));