[Scummvm-git-logs] scummvm master -> 87547abc34501fbbcd0b0565fa77b39b74145511
sdelamarre
noreply at scummvm.org
Sat Nov 7 21:23:32 UTC 2026
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
6726f71d6f GOB: Yet another adjustments related to background videos
2a0c6996e8 GOB: Fix a condition for loop videos
87547abc34 GOB: Fix a missing condition in hotspot recalculation
Commit: 6726f71d6f4a6c0312714a9bd18602ce557d07eb
https://github.com/scummvm/scummvm/commit/6726f71d6f4a6c0312714a9bd18602ce557d07eb
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2026-11-07T18:55:26+01:00
Commit Message:
GOB: Yet another adjustments related to background videos
- flag "noWaitSound" is actually the true "autoUpdate" switch. It is
constant for now, but later engine feature will switch it on and off.
- previously named "autoUpdate" fields seems to be only a flag indicating
that the destination is the backsurface
Changed paths:
engines/gob/inter_v7.cpp
engines/gob/videoplayer.cpp
engines/gob/videoplayer.h
diff --git a/engines/gob/inter_v7.cpp b/engines/gob/inter_v7.cpp
index 96e019b7c0c..73f3079adf1 100644
--- a/engines/gob/inter_v7.cpp
+++ b/engines/gob/inter_v7.cpp
@@ -872,13 +872,7 @@ void Inter_v7::o7_playVmdOrMusic() {
props.noBlock = true;
}
- // if (_vm->_vidPlayer->getSoundFlags() & 0x100) {
- // props.noWaitSound = true;
- // }
- // Actually, the noWaitSound flag seems to be always set (at least in Adibou/Adi4),
- // independently of the "no wait" sound flag 0x100 in the VMD file header.
-
- props.noWaitSound = true;
+ _vm->_vidPlayer->setAutoUpdate(slot, true);
if (props.startFrame == -2 || props.startFrame == -3) {
props.startFrame = 0;
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index e10e6e50e43..7e46be1cd53 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -46,7 +46,7 @@ VideoPlayer::Properties::Properties() : type(kVideoTypeTry), sprite(Draw::kFront
startFrame(-1), lastFrame(-1), endFrame(-1), forceSeek(false),
breakKey(kShortKeyEscape), palCmd(8), palStart(0), palEnd(255), palFrame(-1),
noBlock(false), loop(false), fade(false), waitEndFrame(true),
- hasSound(false), canceled(false), noWaitSound(false), slot(-1), reuseSlotWitSameFilename(false) {
+ hasSound(false), canceled(false), slot(-1), reuseSlotWitSameFilename(false) {
}
@@ -74,6 +74,8 @@ void VideoPlayer::Video::close() {
highColorMap = nullptr;
live = false;
+ useBackSurface = false;
+ autoUpdate = false;
}
@@ -196,8 +198,8 @@ int VideoPlayer::openVideo(bool primary, const Common::String &file, Properties
// Set the filename
video->fileName = file;
- video->autoUpdate = (properties.flags & kFlagNoVideo) ||
- (!(properties.flags & 0x200) && !(properties.flags & kFlagOtherSurface));
+ video->useBackSurface = (properties.flags & kFlagNoVideo) ||
+ (!(properties.flags & 0x200) && !(properties.flags & kFlagOtherSurface));
if (_vm->getGameType() == kGameTypeAdibou2 || _vm->getGameType() == kGameTypeAdi4)
_noCursorSwitch = true; // For Adibou2, we always want to see the cursor while a video is playing.
@@ -582,6 +584,14 @@ void VideoPlayer::liveVideosLoop() {
}
}
+void VideoPlayer::setAutoUpdate(int slot, bool value) {
+ Video *video = getVideoBySlot(slot);
+ if (!video)
+ return;
+
+ video->autoUpdate = value;
+}
+
void VideoPlayer::updateVideos(bool force, int exceptSlot) {
liveVideosLoop();
@@ -621,7 +631,7 @@ void VideoPlayer::updateVideo(int slot, bool force) {
}
if (_vm->getGameType() == kGameTypeAdibou2 || _vm->getGameType() == kGameTypeAdi4) {
- if ((video->decoder->hasVideoData() && !video->autoUpdate) || !video->properties.noWaitSound)
+ if ((video->decoder->hasVideoData() && !video->useBackSurface) || !video->autoUpdate)
return;
video->properties.startFrame = video->decoder->getCurFrame();
diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h
index b038882d291..28e77bbe098 100644
--- a/engines/gob/videoplayer.h
+++ b/engines/gob/videoplayer.h
@@ -108,8 +108,6 @@ public:
int slot; ///< Explicit slot index (-1 = auto).
bool reuseSlotWitSameFilename;
- bool noWaitSound;
-
Properties();
};
@@ -140,6 +138,7 @@ public:
bool isPlayingLive() const;
bool isSoundPlaying() const;
+ void setAutoUpdate(int slot, bool value);
void updateVideos(bool force = false, int exceptSlot = -1);
void liveVideosLoop();
@@ -191,6 +190,7 @@ private:
bool doubleVideo; ///< Should the video be doubled (each pixel drawn as a 2x2 block)
bool live;
+ bool useBackSurface;
bool autoUpdate; ///< Should the video be automatically advanced by updateVideos()
Video();
Commit: 2a0c6996e898b74a05148122cd0f082ffb2fdd4e
https://github.com/scummvm/scummvm/commit/2a0c6996e898b74a05148122cd0f082ffb2fdd4e
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2026-11-07T18:55:26+01:00
Commit Message:
GOB: Fix a condition for loop videos
Fix the voiceover incorrectly looping in some Adi4/Anglais exercices
Changed paths:
engines/gob/inter_v7.cpp
diff --git a/engines/gob/inter_v7.cpp b/engines/gob/inter_v7.cpp
index 73f3079adf1..03eaecfbc6e 100644
--- a/engines/gob/inter_v7.cpp
+++ b/engines/gob/inter_v7.cpp
@@ -848,13 +848,6 @@ void Inter_v7::o7_playVmdOrMusic() {
if (props.startFrame == -2)
props.noBlock = true;
- if ((props.slot == 1 && !(props.flags & VideoPlayer::kFlagNoVideo)) ||
- startFrameCopy == -20) {
- props.loop = true;
- // TODO: one more mode is missing if start frame == -200
- // In that case, the video is not closed at the end, but does not loop either
- }
-
_vm->_vidPlayer->evaluateFlags(props);
bool primary = true;
@@ -872,6 +865,13 @@ void Inter_v7::o7_playVmdOrMusic() {
props.noBlock = true;
}
+ if ((props.slot == 1 && !(props.flags & VideoPlayer::kFlagNoVideo) && _vm->_vidPlayer->hasVideo(slot)) ||
+ startFrameCopy == -20) {
+ props.loop = true;
+ // TODO: one more mode is missing if start frame == -200
+ // In that case, the video is not closed at the end, but does not loop either
+ }
+
_vm->_vidPlayer->setAutoUpdate(slot, true);
if (props.startFrame == -2 || props.startFrame == -3) {
Commit: 87547abc34501fbbcd0b0565fa77b39b74145511
https://github.com/scummvm/scummvm/commit/87547abc34501fbbcd0b0565fa77b39b74145511
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2026-11-07T18:55:26+01:00
Commit Message:
GOB: Fix a missing condition in hotspot recalculation
Changed paths:
engines/gob/hotspots.cpp
diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp
index b944ac74d6b..4b3979179a4 100644
--- a/engines/gob/hotspots.cpp
+++ b/engines/gob/hotspots.cpp
@@ -321,6 +321,11 @@ void Hotspots::recalculate(bool force) {
// Not forcing a special hotspot
continue;
+ if (_vm->getGameType() == kGameTypeAdibou2 || _vm->getGameType() == kGameTypeAdi4) {
+ if ((spot.getState() & kStateFilledDisabled) != kStateFilled)
+ continue;
+ }
+
if (spot.funcPos == 0)
// Simple coordinates don't need update
continue;
More information about the Scummvm-git-logs
mailing list