[Scummvm-git-logs] scummvm master -> 5ac2178f4e9e88e9e79c677edd66acd37b5f530d

[dreammaster]

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

Summary:
5ac2178f4e BAGEL: MINIGAMES: Archeroids m_bGameActive end check


Commit: 5ac2178f4e9e88e9e79c677edd66acd37b5f530d
    https://github.com/scummvm/scummvm/commit/5ac2178f4e9e88e9e79c677edd66acd37b5f530d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-12-26T10:05:12+11:00

Commit Message:
BAGEL: MINIGAMES: Archeroids m_bGameActive end check

There's an assert in MoveBadGuys for m_bGameActive not being false.
However, one time it triggered for me after losing the minigame.
I haven't been able to replicate it, but to guard against it
happening, I've changed it from an assert to an if/return

Changed paths:
    engines/bagel/hodjnpodj/archeroids/main.cpp


diff --git a/engines/bagel/hodjnpodj/archeroids/main.cpp b/engines/bagel/hodjnpodj/archeroids/main.cpp
index 8e7d5c446c6..e26e63370ba 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/main.cpp
@@ -2289,10 +2289,12 @@ bool CMainWindow::MoveBadGuys(CDC *pDC) {
 	CSprite *pSprite;
 	int i, n;
 
+	if (!m_bGameActive)
+		return true;
+
 	// can't access a null pointer
 	assert(pDC != nullptr);
 	assert(m_bTimerActive);
-	assert(m_bGameActive);
 
 	if (!m_bPause && (m_nBadGuys > 0) && (m_pBadGuyList != nullptr) && !m_bNewGame) {