[Scummvm-git-logs] scummvm master -> 6b7b15b7d369c2ecabac8a7baaffa6e4dc4d1c42

[dreammaster]

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

Summary:
8d495b8e78 BAGEL: METAGAME: Fix shadowed DoWaitCursor warning
6b7b15b7d3 BAGEL: MINIGAMES: Should quit check during Garfunkle instruments anim


Commit: 8d495b8e78fe626eec45672a9767211d26bf1d47
    https://github.com/scummvm/scummvm/commit/8d495b8e78fe626eec45672a9767211d26bf1d47
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-11-26T22:39:34-08:00

Commit Message:
BAGEL: METAGAME: Fix shadowed DoWaitCursor warning

Changed paths:
    engines/bagel/hodjnpodj/metagame/gtl/pawn.h


diff --git a/engines/bagel/hodjnpodj/metagame/gtl/pawn.h b/engines/bagel/hodjnpodj/metagame/gtl/pawn.h
index 899281814c2..813547ee53a 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/pawn.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/pawn.h
@@ -83,6 +83,11 @@ public:
 	static  void DoWaitCursor();
 	static  void DoArrowCursor();
 
+	// Included to stop warning about the static DoWaitCursor hiding inherited version
+	void DoWaitCursor(int nCode) override {
+		CDialog::DoWaitCursor(nCode);
+	}
+
 private:
 	bool SetupKeyboardHook();
 	void RemoveKeyboardHook();


Commit: 6b7b15b7d369c2ecabac8a7baaffa6e4dc4d1c42
    https://github.com/scummvm/scummvm/commit/6b7b15b7d369c2ecabac8a7baaffa6e4dc4d1c42
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-11-27T01:59:43-08:00

Commit Message:
BAGEL: MINIGAMES: Should quit check during Garfunkle instruments anim

Changed paths:
    engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp


diff --git a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
index a41b30b5328..ce5e7ba26ac 100644
--- a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
@@ -1088,6 +1088,9 @@ void CMainWindow::PlayBackSeries(int nNumNotes) {
 
 	pNewNote = CNote::GetNoteHead();
 	for (i = nNumNotes; i > 0; --i) {
+		if (g_engine->shouldQuit())
+			break;
+
 		if (pNewNote) {                                                              // If this isn't the end
 			m_nButID = pNewNote->GetValue();                                        // Get the new note