[Scummvm-git-logs] scummvm master -> 34c617ea69efa750d8ee7bf5661d02bf2a76a65f

[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:
fc120a32d4 JANITORIAL: Fix formatting
34c617ea69 DIRECTOR: LINGO: Print MENUREF


Commit: fc120a32d4f5e5092cbaa5fdc7c345cd7494ee66
    https://github.com/scummvm/scummvm/commit/fc120a32d4f5e5092cbaa5fdc7c345cd7494ee66
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-06-22T00:58:44+02:00

Commit Message:
JANITORIAL: Fix formatting

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


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 7d013321ead..faa715f2629 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -627,7 +627,7 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 			menuItem = g_director->_wm->getMenu()->getSubMenuItem(menu, id.u.menu->menuItemIdNum - 1);
 		}
 
-		switch(field) {
+		switch (field) {
 		case kTheCheckMark:
 			d.type = INT;
 			d.u.i = g_director->_wm->getMenuItemCheckMark(menuItem);
@@ -1089,7 +1089,7 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
 			warning("Wrong menuItem!");
 			break;
 		}
-		switch(field) {
+		switch (field) {
 		case kTheCheckMark:
 			g_director->_wm->setMenuItemCheckMark(menuItem, d.asInt());
 			break;


Commit: 34c617ea69efa750d8ee7bf5661d02bf2a76a65f
    https://github.com/scummvm/scummvm/commit/34c617ea69efa750d8ee7bf5661d02bf2a76a65f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-06-22T01:02:30+02:00

Commit Message:
DIRECTOR: LINGO: Print MENUREF

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 0bef4c1bf45..9b1498f5445 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -957,6 +957,7 @@ Common::String Datum::asString(bool printonly) const {
 		s += ")";
 		break;
 	case MENUREF:
+		s = Common::String::format("menu(%d, %d)", u.menu->menuIdNum, u.menu->menuItemIdNum);
 		break;
 	default:
 		warning("Incorrect operation asString() for type: %s", type2str());