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

[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:
ba0b8e7781 DGDS: Handle cases where a dialog is requested without arguments
fd0ffd7904 DGDS: Add a placeholder for the shell game in HoC


Commit: ba0b8e778182e891938788494549f28c23dae3e6
    https://github.com/scummvm/scummvm/commit/ba0b8e778182e891938788494549f28c23dae3e6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-07-18T01:27:37+03:00

Commit Message:
DGDS: Handle cases where a dialog is requested without arguments

This happens for example when right-clicking in Kathmandu

Changed paths:
    engines/dgds/scene.cpp


diff --git a/engines/dgds/scene.cpp b/engines/dgds/scene.cpp
index 95e29ed508c..1f17d7a9185 100644
--- a/engines/dgds/scene.cpp
+++ b/engines/dgds/scene.cpp
@@ -620,7 +620,7 @@ bool Scene::runSceneOp(const SceneOp &op) {
 	case kSceneOpShowDlg:
 		if (op._args.size() == 1)
 			showDialog(0, op._args[0]);
-		else
+		else if(op._args.size() > 1)
 			showDialog(op._args[0], op._args[1]);
 		break;
 	case kSceneOpShowInvButton:


Commit: fd0ffd7904ecb9f8536e7f034cb106edd62754bd
    https://github.com/scummvm/scummvm/commit/fd0ffd7904ecb9f8536e7f034cb106edd62754bd
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-07-18T01:28:18+03:00

Commit Message:
DGDS: Add a placeholder for the shell game in HoC

Changed paths:
    engines/dgds/scene.cpp
    engines/dgds/scene.h


diff --git a/engines/dgds/scene.cpp b/engines/dgds/scene.cpp
index 1f17d7a9185..04d7a5bcb68 100644
--- a/engines/dgds/scene.cpp
+++ b/engines/dgds/scene.cpp
@@ -758,6 +758,9 @@ bool Scene::runChinaOp(const SceneOp &op) {
 	case kSceneOpOpenChinaTankMenu:
 		engine->setMenuToTrigger(kMenuSkipArcade);
 		break;
+	case kSceneOpShellGame:
+		warning("TODO: Implement shell game");
+		break;
 	case kSceneOpOpenChinaStartIntro:
 		// The game first jumps to scene 100, and then to 98
 		engine->changeScene(98);
diff --git a/engines/dgds/scene.h b/engines/dgds/scene.h
index 0dc3ed1f49c..6f7ccb0bef7 100644
--- a/engines/dgds/scene.h
+++ b/engines/dgds/scene.h
@@ -125,6 +125,7 @@ enum SceneOpCode {
 
 	// China-specific opcodes
 	kSceneOpOpenChinaTankMenu = 102,
+	kSceneOpShellGame = 110,
 	kSceneOpOpenChinaOpenGameOverMenu = 114,	// args: none.
 	kSceneOpOpenChinaOpenSkipCreditsMenu = 115,	// args: none.
 	kSceneOpOpenChinaStartIntro = 116,	// args: none.