[Scummvm-git-logs] scummvm master -> cb88bd6a9a3e4d04eb2c506130dc1077a619cda3

[bluegr]

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:
1ddfd01980 DGDS: Hook the jump to game menu button for Willy
cb88bd6a9a DGDS: Silence a warning about a reusable global in Willy


Commit: 1ddfd019809a2e2d17fe95b66f00412cd26f4305
    https://github.com/scummvm/scummvm/commit/1ddfd019809a2e2d17fe95b66f00412cd26f4305
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-07-09T23:40:02+03:00

Commit Message:
DGDS: Hook the jump to game menu button for Willy

Changed paths:
    engines/dgds/menu.cpp


diff --git a/engines/dgds/menu.cpp b/engines/dgds/menu.cpp
index 955201cc525..460664761b1 100644
--- a/engines/dgds/menu.cpp
+++ b/engines/dgds/menu.cpp
@@ -528,7 +528,7 @@ void Menu::handleClickSkipPlayIntroMenu(const Common::Point &mouse) {
 		if (engine->getGameId() == GID_HOC)
 			engine->changeScene(24);
 		else if (engine->getGameId() == GID_WILLY)
-			warning("TODO: Jump to game");
+			engine->changeScene(4);
 		break;
 	default:
 		handleClick(mouse);


Commit: cb88bd6a9a3e4d04eb2c506130dc1077a619cda3
    https://github.com/scummvm/scummvm/commit/cb88bd6a9a3e4d04eb2c506130dc1077a619cda3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-07-09T23:40:02+03:00

Commit Message:
DGDS: Silence a warning about a reusable global in Willy

This reduces the spam in the console, and will aid in debugging

Changed paths:
    engines/dgds/scene.cpp


diff --git a/engines/dgds/scene.cpp b/engines/dgds/scene.cpp
index 016028672e7..f17bb21cae0 100644
--- a/engines/dgds/scene.cpp
+++ b/engines/dgds/scene.cpp
@@ -2043,10 +2043,16 @@ void GDSScene::globalOps(const Common::Array<uint16> &args) {
 int16 GDSScene::getGlobal(uint16 num) {
 	DgdsEngine *engine = static_cast<DgdsEngine *>(g_engine);
 	int curSceneNum = engine->getScene()->getNum();
+	DgdsGameId gameId = engine->getGameId();
+
 	for (const auto &global : _perSceneGlobals) {
 		if (global.matches(num, curSceneNum))
 			return global._val;
 		else if (!global.matches(num, curSceneNum) && global.numMatches(num)) {
+			// Don't warn on known reusable scene globals
+			if (gameId == GID_WILLY && num == 185)
+				return global._val;
+
 			// This looks like a script bug, get it anyway
 			warning("getGlobal: scene global %d is not in scene %d", num, curSceneNum);
 			return global._val;