[Scummvm-git-logs] scummvm master -> 07a795d6005fe1655b7746dc7de7e8624ef6cda4

[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:
3bae66919b SCUMM: Don't pause at startup in Moonbase.
07a795d600 SCUMM HE: Don't show exit dialog in Moonbase.


Commit: 3bae66919b23f70fb99dd9afd161d897961fe011
    https://github.com/scummvm/scummvm/commit/3bae66919b23f70fb99dd9afd161d897961fe011
Author: Little Cat (toontownlittlecat at gmail.com)
Date: 2022-04-15T22:41:21+02:00

Commit Message:
SCUMM: Don't pause at startup in Moonbase.

Changed paths:
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index cb698a186a1..9885639632e 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -2860,6 +2860,20 @@ int ScummEngine::getKeyState(int key) {
 }
 
 void ScummEngine_v6::o6_delayFrames() {
+	// WORKAROUND:  At startup, Moonbase Commander will pause for 20 frames before
+	// showing the Infogrames logo.  The purpose of this break is to give time for the
+	// GameSpy Arcade application to fill with the Online game infomation.
+	// 
+	// [0000] (84) localvar2 = max(readConfigFile.number(":var263:","user","wait-for-gamespy"),10)
+	// [0029] (08) delayFrames((localvar2 * 2))
+	// 
+	// But since we don't support GameSpy and have our own Online support, this break
+	// has become redundant and only wastes time.
+	if (_game.id == GID_MOONBASE && vm.slot[_currentScript].number == 69) {
+		pop();
+		return;
+	}
+
 	ScriptSlot *ss = &vm.slot[_currentScript];
 	if (ss->delayFrameCount == 0) {
 		ss->delayFrameCount = pop();


Commit: 07a795d6005fe1655b7746dc7de7e8624ef6cda4
    https://github.com/scummvm/scummvm/commit/07a795d6005fe1655b7746dc7de7e8624ef6cda4
Author: Little Cat (toontownlittlecat at gmail.com)
Date: 2022-04-15T22:41:21+02:00

Commit Message:
SCUMM HE: Don't show exit dialog in Moonbase.

Changed paths:
    engines/scumm/he/script_v100he.cpp


diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index fbeba9b5800..30c1156d87e 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -2178,7 +2178,12 @@ void ScummEngine_v100he::o100_systemOps() {
 		break;
 	case 132:
 		// Confirm shutdown
-		confirmExitDialog();
+		if (_game.id == GID_MOONBASE)
+			// Moonbase uses this subOp to quit the game (The confirmation dialog
+			// exists inside the game).
+			quitGame();
+		else
+			confirmExitDialog();
 		break;
 	case 133:
 		quitGame();