[Scummvm-git-logs] scummvm master -> 93992fa572bfa2ea2df0c4e7bc1d63de774019e1

bluegr noreply at scummvm.org
Tue Mar 25 02:59:16 UTC 2025


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

Summary:
93992fa572 WAGE: Fix crash due to outdated sound queue timestamps


Commit: 93992fa572bfa2ea2df0c4e7bc1d63de774019e1
    https://github.com/scummvm/scummvm/commit/93992fa572bfa2ea2df0c4e7bc1d63de774019e1
Author: aunnoman1 (aunnoman123 at outlook.com)
Date: 2025-03-25T04:59:11+02:00

Commit Message:
WAGE: Fix crash due to outdated sound queue timestamps

Clear `_soundQueue` when re-entering a scene with stale timestamps.
Previously, if a player left and later returned to a scene, the
sound queue could contain old timestamps. This caused `installTimerProc`
to compute a negative delay, triggering an assertion failure
(`interval > 0`) in `DefaultTimerManager`.

Fixed by clearing the sound queue when the player moves to another
scene.

Tested by re-entering scenes with sound timers and confirming no crashes.

Changed paths:
    engines/wage/combat.cpp


diff --git a/engines/wage/combat.cpp b/engines/wage/combat.cpp
index d36071fc2d8..b98d49301d8 100644
--- a/engines/wage/combat.cpp
+++ b/engines/wage/combat.cpp
@@ -520,6 +520,7 @@ bool WageEngine::handleMoveCommand(Directions dir, const char *dirName) {
 			if (strlen(msg) > 0) {
 				appendText(msg);
 			}
+			_soundQueue.clear();
 			_world->move(_world->_player, scene);
 			return true;
 		}




More information about the Scummvm-git-logs mailing list