[Scummvm-git-logs] scummvm branch-3-0 -> 754fcc98391e599770b2157a8a67dc50f3456b66
dreammaster
noreply at scummvm.org
Thu Dec 25 23:08:13 UTC 2025
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:
754fcc9839 BAGEL: MINIGAMES: Archeroids m_bGameActive end check
Commit: 754fcc98391e599770b2157a8a67dc50f3456b66
https://github.com/scummvm/scummvm/commit/754fcc98391e599770b2157a8a67dc50f3456b66
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-12-26T10:08:07+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) {
More information about the Scummvm-git-logs
mailing list