[Scummvm-git-logs] scummvm master -> 78232b5242338169a15339a81572263020037988
sev-
noreply at scummvm.org
Tue Nov 10 12:02:29 UTC 2026
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
1427b84b4c DIRECTOR: Add detection for another The Daedalus Encounter (Mac)
7b54a33ec1 DIRECTOR: Fix underflow in digital video movieTime at time 0
aadea50d8f DIRECTOR: Reload digital video when its fileName is set
78232b5242 DIRECTOR: Don't send idle while Lingo is frozen
Commit: 1427b84b4c3e645111b118c7a1395175646bbd21
https://github.com/scummvm/scummvm/commit/1427b84b4c3e645111b118c7a1395175646bbd21
Author: angstsmurf (ignalina at me.com)
Date: 2026-11-10T13:02:22+01:00
Commit Message:
DIRECTOR: Add detection for another The Daedalus Encounter (Mac)
Changed paths:
engines/director/detection_tables.h
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 4bf5701af0a..076d5d4123b 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -4124,6 +4124,8 @@ static const DirectorGameDescription gameDescriptions[] = {
// "DAEDALUS.DAT", "4eb2fab14f1b932ae9f01d8b05a411de", 69538, 404),
MACGAME2("daedalus", "", "DAEDALUS", "0c7bbb4b24823e5ab871cb4c1d6f3710", 483490,
"DAEDALUS.DAT", "2b9e22ee93e5d58f383ef389fa09e12b", 69538, 404),
+ MACGAME2("daedalus", "", "DAEDALUS", "3c25d0ce5582fd3f627e6ee1e846d276", 486588,
+ "DAEDALUS.DAT", "27ef08567a2247b547fb1124333de84e", 70179, 404),
// MACGAME2_l("daedalus", "Minimal", "DAEDALUS", "0c7bbb4b24823e5ab871cb4c1d6f3710", 483490,
// "DAEDALUS.DAT", "2b9e22ee93e5d58f383ef389fa09e12b", 69538, Common::DE_DEU, 404),
MACGAME2_l("daedalus", "", "DAEDALUS", "0c7bbb4b24823e5ab871cb4c1d6f3710", 483490,
Commit: 7b54a33ec15f6bb8c591cec00fd20a81fec694fe
https://github.com/scummvm/scummvm/commit/7b54a33ec15f6bb8c591cec00fd20a81fec694fe
Author: angstsmurf (ignalina at me.com)
Date: 2026-11-10T13:02:22+01:00
Commit Message:
DIRECTOR: Fix underflow in digital video movieTime at time 0
getTime() is unsigned, so "1 + (ms * 60 - 1) / 1000" wrapped around
when the video was at position 0, making movieTime report the end of
the movie. Scripts polling movieTime (e.g. The Daedalus Encounter)
then skipped videos immediately.
Changed paths:
engines/director/castmember/digitalvideo.cpp
diff --git a/engines/director/castmember/digitalvideo.cpp b/engines/director/castmember/digitalvideo.cpp
index 23fd2fd11d0..192ac99cfaa 100644
--- a/engines/director/castmember/digitalvideo.cpp
+++ b/engines/director/castmember/digitalvideo.cpp
@@ -568,7 +568,9 @@ uint DigitalVideoCastMember::getTimeScale() {
uint DigitalVideoCastMember::getMovieCurrentTime() {
if (!_video)
return 0;
- int ticks = 1 + ((_video->getTime() * getTimeScale() - 1)/1000);
+ // Round up to ticks. getTime() is unsigned, so "1 + (ms * scale - 1) / 1000"
+ // would underflow to the end of the movie when the time is 0.
+ int ticks = (_video->getTime() * getTimeScale() + 999) / 1000;
int stamp = MIN<int>(ticks, getMovieTotalTime());
return stamp;
@@ -588,7 +590,7 @@ uint DigitalVideoCastMember::getMovieTotalTime() {
if (!_video)
return 0;
- int ticks = 1 + ((_video->getDuration().msecs() * getTimeScale() - 1)/1000);
+ int ticks = (_video->getDuration().msecs() * getTimeScale() + 999) / 1000;
return ticks;
}
Commit: aadea50d8f3e2ac261ec3d19fc6172f60694b757
https://github.com/scummvm/scummvm/commit/aadea50d8f3e2ac261ec3d19fc6172f60694b757
Author: angstsmurf (ignalina at me.com)
Date: 2026-11-10T13:02:22+01:00
Commit Message:
DIRECTOR: Reload digital video when its fileName is set
Setting the fileName of a digital video cast member from Lingo now
loads the new file (taking precedence over the alias in the embedded
MooV resource) and restarts playback in the channel. The Daedalus
Encounter swaps the video of a single cast member this way.
Changed paths:
engines/director/castmember/digitalvideo.cpp
engines/director/castmember/digitalvideo.h
diff --git a/engines/director/castmember/digitalvideo.cpp b/engines/director/castmember/digitalvideo.cpp
index 192ac99cfaa..57acee17909 100644
--- a/engines/director/castmember/digitalvideo.cpp
+++ b/engines/director/castmember/digitalvideo.cpp
@@ -108,6 +108,7 @@ DigitalVideoCastMember::DigitalVideoCastMember(Cast *cast, uint16 castId)
_scaleX = _scaleY = 100;
_dirty = false;
_emptyFile = false;
+ _useLinkedPath = false;
memset(_ditheringPalette, 0, 256*3);
}
@@ -145,6 +146,7 @@ DigitalVideoCastMember::DigitalVideoCastMember(Cast *cast, uint16 castId, Common
_center = _vflags & 0x01;
_dirty = false;
_emptyFile = false;
+ _useLinkedPath = false;
memset(_ditheringPalette, 0, 256*3);
@@ -188,6 +190,7 @@ DigitalVideoCastMember::DigitalVideoCastMember(Cast *cast, uint16 castId, Digita
_avimovie = source._avimovie;
_qtmovie = source._qtmovie;
_dirty = source._dirty;
+ _useLinkedPath = source._useLinkedPath;
_frameRateType = source._frameRateType;
_videoType = source._videoType;
@@ -252,7 +255,9 @@ CastMember *DigitalVideoCastMember::createFromXtra(Cast *cast, uint16 castId, Xt
}
bool DigitalVideoCastMember::loadVideoFromCast() {
- Common::String path = getCast()->getVideoPath(_castId);
+ // Once Lingo has set the fileName, it takes precedence over any
+ // alias stored in the embedded MooV resource
+ Common::String path = _useLinkedPath ? getCast()->getLinkedPath(_castId) : getCast()->getVideoPath(_castId);
if (!path.empty())
return loadVideo(path);
return false;
@@ -872,11 +877,15 @@ void DigitalVideoCastMember::setField(int field, const Datum &d) {
// Update the filename, then force the video to be replaced.
// Channel dimensions are replaced by the video.
CastMember::setField(field, d);
- loadVideoFromCast();
- if (_channel) {
- Common::Rect rect = getInitialRect();
- _channel->setWidth(rect.width());
- _channel->setHeight(rect.height());
+ if (_needsReload) {
+ _needsReload = false;
+ _useLinkedPath = true;
+ reloadVideo();
+ if (_channel) {
+ Common::Rect rect = getInitialRect();
+ _channel->setWidth(rect.width());
+ _channel->setHeight(rect.height());
+ }
}
return;
case kTheFrameRate:
@@ -928,6 +937,26 @@ bool DigitalVideoCastMember::canWriteCastData() {
return _cast->_version >= kFileVer400 && _cast->_version < kFileVer1100;
}
+void DigitalVideoCastMember::reloadVideo() {
+ _emptyFile = false;
+
+ if (!loadVideoFromCast())
+ return;
+
+ debugC(2, kDebugLoading, "DigitalVideoCastMember::reloadVideo(): cast %d now uses %s", _castId, _filename.c_str());
+
+ if (_channel) {
+ // Restart playback on the new file; scripts usually set
+ // movieTime/movieRate right after changing the fileName
+ _channel->_movieTime = 0;
+ _channel->_startTime = 0;
+ _channel->_stopTime = 0;
+ startVideo();
+ }
+
+ _dirty = true;
+}
+
uint32 DigitalVideoCastMember::getCastDataSize() {
// We're only reading the _initialRect and _vflags from the Cast Data
// _initialRect : 8 bytes + _vflags : 4 bytes + castType and flags1 (see Cast::loadCastData() for Director 4 only) 2 byte
diff --git a/engines/director/castmember/digitalvideo.h b/engines/director/castmember/digitalvideo.h
index 2a275899c31..0053a2e6326 100644
--- a/engines/director/castmember/digitalvideo.h
+++ b/engines/director/castmember/digitalvideo.h
@@ -59,6 +59,7 @@ public:
void stopVideo();
void rewindVideo();
bool endOfVideo();
+ void reloadVideo();
uint getTimeScale();
uint getMovieCurrentTime();
@@ -105,6 +106,7 @@ public:
bool _avimovie, _qtmovie;
bool _dirty;
bool _emptyFile;
+ bool _useLinkedPath;
FrameRateType _frameRateType;
DigitalVideoType _videoType;
Commit: 78232b5242338169a15339a81572263020037988
https://github.com/scummvm/scummvm/commit/78232b5242338169a15339a81572263020037988
Author: angstsmurf (ignalina at me.com)
Date: 2026-11-10T13:02:22+01:00
Commit Message:
DIRECTOR: Don't send idle while Lingo is frozen
Similar to input events, idle is now only dispatched when no Lingo state
is frozen. Otherwise a handler suspended by "go" (for instance one called
from an idle handler) could be overtaken by a re-entrant idle before
resuming. Fixes The Daedalus Encounter jumping to a death scene during
the intro.
This has been confirmed by disassembly of Director players from 3 to 6.
Changed paths:
engines/director/score.cpp
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 81eea3257b6..d6e94be5049 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -334,7 +334,10 @@ void Score::step() {
_lingo->processEvents(_movie->_inputEventQueue, true);
}
if (_version >= kFileVer300 && !_window->_newMovieStarted && _playState != kPlayStopped) {
- if (!_skipIdle)
+ // Like input events, idle is only sent when no Lingo is mid-execution.
+ // Otherwise a handler frozen by "go" (e.g. one called from idle itself)
+ // can be overtaken by a re-entrant idle before it resumes.
+ if (!_skipIdle && !_window->frozenLingoStateCount())
_movie->processEvent(kEventIdle);
if (_version >= kFileVer600) {
More information about the Scummvm-git-logs
mailing list