[Scummvm-git-logs] scummvm master -> 49d9bf8bea73ab26c8cc4335f9165b06ba220030
aquadran
noreply at scummvm.org
Sat Jan 17 14:00:10 UTC 2026
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:
49d9bf8bea WINTERMUTE: fix subtitles not shown on video
Commit: 49d9bf8bea73ab26c8cc4335f9165b06ba220030
https://github.com/scummvm/scummvm/commit/49d9bf8bea73ab26c8cc4335f9165b06ba220030
Author: Dario Scarpa (3518552+darioscarpa at users.noreply.github.com)
Date: 2026-01-17T15:00:07+01:00
Commit Message:
WINTERMUTE: fix subtitles not shown on video
At the beginning of the decoding, `getCurFrame()` returns `-1`, so it
happened (without the check added by this commit) that
`_subtitler->update(-1)` got called.
As `VideoSubtitler::update() takes a `uint32` parameter, that `-1`
became `4294967295`, causing all the subtitles to be considered
overdue and skipped.
Changed paths:
engines/wintermute/video/video_theora_player.cpp
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 1853bd2d412..cd756f6a47b 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -289,7 +289,10 @@ bool VideoTheoraPlayer::update() {
if (_theoraDecoder) {
if (_subtitler && _foundSubtitles && _game->_subtitles) {
- _subtitler->update(_theoraDecoder->getCurFrame());
+ int curFrame = _theoraDecoder->getCurFrame();
+ if (curFrame != -1) { // passing UINT32_MAX would skip all subtitles!
+ _subtitler->update(curFrame);
+ }
}
if (_theoraDecoder->endOfVideo() && _looping) {
More information about the Scummvm-git-logs
mailing list