[Scummvm-git-logs] scummvm master -> bc442036b733a81fe596bbd12b9b5c33a7d91b2b

[sev-]

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:
2a475c2eda WAGE: Properly detect premature end of bitmaps
bc442036b7 WAGE: Make sure the sounds are scheduled in the future.


Commit: 2a475c2edac08308201bb9000ae9d51ceda451d5
    https://github.com/scummvm/scummvm/commit/2a475c2edac08308201bb9000ae9d51ceda451d5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-05T01:09:19+02:00

Commit Message:
WAGE: Properly detect premature end of bitmaps

Changed paths:
    engines/wage/design.cpp


diff --git a/engines/wage/design.cpp b/engines/wage/design.cpp
index 48dbb1b29ad..cf66cdb40a2 100644
--- a/engines/wage/design.cpp
+++ b/engines/wage/design.cpp
@@ -622,7 +622,7 @@ void Design::drawBitmap(Graphics::ManagedSurface *surface, Common::SeekableReadS
 				}
 			}
 
-			if (numBytes <= 0) {
+			if (numBytes < 0 && (i + 1 < count) && (y < h)) {
 				warning("Design::drawBitmap(): Bitmap data ended prematurely");
 				break;
 			}


Commit: bc442036b733a81fe596bbd12b9b5c33a7d91b2b
    https://github.com/scummvm/scummvm/commit/bc442036b733a81fe596bbd12b9b5c33a7d91b2b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-05T01:17:34+02:00

Commit Message:
WAGE: Make sure the sounds are scheduled in the future.

Fixes bug #16196

Changed paths:
    engines/wage/sound.cpp


diff --git a/engines/wage/sound.cpp b/engines/wage/sound.cpp
index 6f5064e3e1d..8397372f500 100644
--- a/engines/wage/sound.cpp
+++ b/engines/wage/sound.cpp
@@ -158,10 +158,13 @@ static void soundTimer(void *refCon) {
 
 			Common::sort(engine->_soundQueue.begin(), engine->_soundQueue.end());
 
-			int nextRun = engine->_soundQueue.front();
+			int nextRun = engine->_soundQueue.front() - g_system->getMillis();
 			engine->_soundQueue.pop_front();
 
-			g_system->getTimerManager()->installTimerProc(&soundTimer, (nextRun - g_system->getMillis()) * 1000, scene, "WageEngine::soundTimer");
+			if (nextRun < 0)
+				nextRun = 1;
+
+			g_system->getTimerManager()->installTimerProc(&soundTimer, nextRun * 1000, scene, "WageEngine::soundTimer");
 		} else {
 			warning("updateSoundTimerForScene: Unknown sound type %d", scene->_soundType);
 		}