[Scummvm-git-logs] scummvm master -> 33d7eaad2bdb16c42df8f7f72ad2f2eb8b7bcea8

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1ec5304e8a DIRECTOR: Fix buildbot failure on null macmenu
fb6497a059 DIRECTOR: Fix constrainH fail build step in BUILDBOT by adding _constraint check
33d7eaad2b DIRECTOR: LINGO: Add check for existence of macmenu in Lingo::setTheEntity()


Commit: 1ec5304e8aa351cd829a3c57ae829da1e06b9a93
    https://github.com/scummvm/scummvm/commit/1ec5304e8aa351cd829a3c57ae829da1e06b9a93
Author: Pragyansh Chaturvedi (pragyanshchaturvedi18 at gmail.com)
Date: 2022-07-02T23:58:15+02:00

Commit Message:
DIRECTOR: Fix buildbot failure on null macmenu

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 3a7b258e3c2..3edf961031f 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -312,6 +312,9 @@ int MacMenu::numberOfMenus() {
 MacMenuItem *MacMenu::getMenuItem(const Common::String &menuId) {
 	MacMenuItem *menu = nullptr;
 
+	if (!this)
+		return menu;
+
 	for (uint i = 0; i < _items.size(); i++) {
 		// TODO: support unicode text menu
 		// didn't support unicode item finding yet


Commit: fb6497a059fbaa82db60acd94ff7f080d11eb2fd
    https://github.com/scummvm/scummvm/commit/fb6497a059fbaa82db60acd94ff7f080d11eb2fd
Author: Pragyansh Chaturvedi (pragyanshchaturvedi18 at gmail.com)
Date: 2022-07-02T23:58:15+02:00

Commit Message:
DIRECTOR: Fix constrainH fail build step in BUILDBOT by adding _constraint check

Changed paths:
    engines/director/channel.cpp
    engines/director/lingo/lingo-the.cpp
    graphics/macgui/macmenu.cpp


diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp
index 83d5817fc7e..2cf2ec12e73 100644
--- a/engines/director/channel.cpp
+++ b/engines/director/channel.cpp
@@ -337,7 +337,7 @@ Common::Rect Channel::getBbox(bool unstretched) {
 						unstretched ? _sprite->_height : _height);
 	result.moveTo(getPosition());
 
-	if (_constraint) {
+	if (_constraint > 0 && _constraint <= g_director->getCurrentMovie()->getScore()->_channels.size()) {
 		Common::Rect constraintBbox = g_director->getCurrentMovie()->getScore()->_channels[_constraint]->getBbox();
 		if (result.top < constraintBbox.top)
 			_currentPoint.y = constraintBbox.top;
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 377493f18be..3e143ca74b7 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -1290,6 +1290,11 @@ int Lingo::getMenuItemsNum(Datum &d) {
 
 	Graphics::MacMenuItem *menu = nullptr;
 
+	if (!g_director->_wm->getMenu()) {
+		warning("Lingo::getMenuItemsNum() : Menu does not exist!");
+		return 0;
+	}
+
 	if (d.u.menu->menuIdNum == -1) {
 		menu = g_director->_wm->getMenu()->getMenuItem(*d.u.menu->menuIdStr);
 	} else {
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 3edf961031f..3a7b258e3c2 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -312,9 +312,6 @@ int MacMenu::numberOfMenus() {
 MacMenuItem *MacMenu::getMenuItem(const Common::String &menuId) {
 	MacMenuItem *menu = nullptr;
 
-	if (!this)
-		return menu;
-
 	for (uint i = 0; i < _items.size(); i++) {
 		// TODO: support unicode text menu
 		// didn't support unicode item finding yet


Commit: 33d7eaad2bdb16c42df8f7f72ad2f2eb8b7bcea8
    https://github.com/scummvm/scummvm/commit/33d7eaad2bdb16c42df8f7f72ad2f2eb8b7bcea8
Author: Pragyansh Chaturvedi (pragyanshchaturvedi18 at gmail.com)
Date: 2022-07-02T23:58:15+02:00

Commit Message:
DIRECTOR: LINGO: Add check for existence of macmenu in Lingo::setTheEntity()

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 3e143ca74b7..cdcf3c30b8f 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -1078,6 +1078,11 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
 		Graphics::MacMenuItem *menu, *menuItem;
 		menu = nullptr, menuItem = nullptr;
 
+		if (!g_director->_wm->getMenu()) {
+			warning("Lingo::setTheEntity() : Menu does not exist!");
+			break;
+		}
+
 		if (id.u.menu->menuIdNum == -1) {
 			menu = g_director->_wm->getMenu()->getMenuItem(*id.u.menu->menuIdStr);
 		} else {