[Scummvm-git-logs] scummvm master -> 675034041810fbf065fce01266781edbaa27a0ab

[dreammaster]

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

Summary:
66c12d5eff BAGEL: DEMO: Load minigame DLLs for resources when starting them
06d6b00625 BAGEL: DEMO: Don't show Maze O Doom hype button in full demo menu
6750340418 BAGEL: DEMO: Return to Zoom map after finishing minigame


Commit: 66c12d5eff5fea6214dbfa4c7185cad1ae0e4f75
    https://github.com/scummvm/scummvm/commit/66c12d5eff5fea6214dbfa4c7185cad1ae0e4f75
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-13T03:02:36-07:00

Commit Message:
BAGEL: DEMO: Load minigame DLLs for resources when starting them

Changed paths:
    engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp


diff --git a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
index 0dbdd47da89..3b915982199 100644
--- a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
@@ -280,9 +280,8 @@ void CHodjPodjWindow::loadNewDLL(LPARAM lParam) {
 
 	stopBackgroundMidi();
 
-	assert(CMgStatic::cGameTable[nWhichDLL]._initFn != nullptr);
-
-	FPDLLFUNCT  lpfnGame;
+	const auto &game = CMgStatic::cGameTable[nWhichDLL];
+	assert(game._initFn != nullptr);
 
 	GAMESTRUCT *lpGameStruct = new GAMESTRUCT;
 	lpGameStruct->lCrowns = 1000;
@@ -293,8 +292,9 @@ void CHodjPodjWindow::loadNewDLL(LPARAM lParam) {
 	lpGameStruct->bPlayingMetagame = false;
 	lpGameStruct->bPlayingHodj = true;
 
-	lpfnGame = CMgStatic::cGameTable[nWhichDLL]._initFn;
-	(void)lpfnGame(m_hWnd, lpGameStruct);
+	// Load the minigame's dll for resources, and launch it
+	pMyApp->addResources(game._dllName);
+	(*game._initFn)(m_hWnd, lpGameStruct);
 }
 
 } // namespace Demo


Commit: 06d6b0062564ca6657df426ac1a06c3071404748
    https://github.com/scummvm/scummvm/commit/06d6b0062564ca6657df426ac1a06c3071404748
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-13T03:08:04-07:00

Commit Message:
BAGEL: DEMO: Don't show Maze O Doom hype button in full demo menu

Changed paths:
    engines/bagel/bagel.cpp
    engines/bagel/bagel.h
    engines/bagel/hodjnpodj/hnplibs/mainmenu.cpp


diff --git a/engines/bagel/bagel.cpp b/engines/bagel/bagel.cpp
index 9745f50a4c0..94adc4affce 100644
--- a/engines/bagel/bagel.cpp
+++ b/engines/bagel/bagel.cpp
@@ -52,6 +52,10 @@ bool BagelEngine::isDemo() const {
 	return (_gameDescription->flags & ADGF_DEMO) != 0;
 }
 
+bool BagelEngine::isMazeODoomDemo() const {
+	return !strcmp(_gameDescription->gameId, "mazeodoom");
+}
+
 SaveStateList BagelEngine::listSaves() const {
 	return getMetaEngine()->listSaves(_targetName.c_str());
 }
diff --git a/engines/bagel/bagel.h b/engines/bagel/bagel.h
index b1191503629..1ba4cf2976f 100644
--- a/engines/bagel/bagel.h
+++ b/engines/bagel/bagel.h
@@ -72,6 +72,7 @@ public:
 	 * Return whether it's a demo
 	 */
 	bool isDemo() const;
+	bool isMazeODoomDemo() const;
 
 	/**
 	 * Gets a random number
diff --git a/engines/bagel/hodjnpodj/hnplibs/mainmenu.cpp b/engines/bagel/hodjnpodj/hnplibs/mainmenu.cpp
index a80f5cf389a..6e34ba62679 100644
--- a/engines/bagel/hodjnpodj/hnplibs/mainmenu.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/mainmenu.cpp
@@ -149,8 +149,8 @@ bool CMainMenu::OnInitDialog() {
 	_quitButton->SetPalette(m_pPalette);
 	_quitButton->SetControl(IDC_OPTIONS_QUIT, this);
 
-	// Add the Hype Button if running the demo
-	if (g_engine->isDemo()) {
+	// Add the Hype Button if running the Maze O' Doom demo
+	if (g_engine->isMazeODoomDemo()) {
 		CRect optionsRect, audioRect;
 		_optionsButton->GetWindowRect(&optionsRect);
 		_audioButton->GetWindowRect(&audioRect);


Commit: 675034041810fbf065fce01266781edbaa27a0ab
    https://github.com/scummvm/scummvm/commit/675034041810fbf065fce01266781edbaa27a0ab
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-13T03:14:20-07:00

Commit Message:
BAGEL: DEMO: Return to Zoom map after finishing minigame

Changed paths:
    engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
    engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h


diff --git a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
index 3b915982199..aba1484c50e 100644
--- a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
@@ -256,6 +256,12 @@ void CHodjPodjWindow::OnParentNotify(unsigned int msg, LPARAM lParam) {
 			// Restart intro video
 			PostMessage(WM_COMMAND, IDC_PLAY_DEMO_MOVIE);
 
+		} else if (nGameReturn == 0) {
+			// Finished a minigame
+			const auto &game = CMgStatic::cGameTable[_minigame];
+			AfxGetApp()->removeResources(game._dllName);
+			PostMessage(WM_COMMAND, IDC_ZOOM);
+
 		} else {
 			loadNewDLL(nGameReturn);
 		}
@@ -275,6 +281,7 @@ void CHodjPodjWindow::loadNewDLL(LPARAM lParam) {
 	pMyApp = AfxGetApp();
 	nWhichDLL = lParam - MG_GAME_BASE;
 	assert(nWhichDLL < MG_GAME_COUNT);
+	_minigame = nWhichDLL;
 
 	blackScreen();
 
diff --git a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h
index 29199bede44..41bbeff4e94 100644
--- a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h
+++ b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h
@@ -37,6 +37,7 @@ private:
 	CPalette *pGamePalette = nullptr;
 	CSound *pBackgroundMidi = nullptr;
 	int _currentCommand = -1;
+	int _minigame = -1;
 
 	void drawBitmap(const char *filename);
 	void startBackgroundMidi();