[Scummvm-git-logs] scummvm master -> 92bd5149024adb27080179a85c946479464ba6ba
sev-
sev at scummvm.org
Tue Aug 25 08:44:04 UTC 2020
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:
92bd514902 DIRECTOR: LINGO: Make sure video is rendered on 'updateStage'
Commit: 92bd5149024adb27080179a85c946479464ba6ba
https://github.com/scummvm/scummvm/commit/92bd5149024adb27080179a85c946479464ba6ba
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-25T10:43:47+02:00
Commit Message:
DIRECTOR: LINGO: Make sure video is rendered on 'updateStage'
Changed paths:
engines/director/lingo/lingo-builtins.cpp
engines/director/score.cpp
engines/director/score.h
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 5f24e80354..bdfc761187 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -2081,7 +2081,7 @@ void LB::b_updateStage(int nargs) {
Score *score = movie->getScore();
if (movie->_videoPlayback) {
- movie->getScore()->renderFrame(movie->getScore()->getCurrentFrame());
+ movie->getScore()->renderFrame(movie->getScore()->getCurrentFrame(), kRenderNoWindowRender);
}
if (movie->getWindow()->render())
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 589dc77627..7c860adffc 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -452,7 +452,8 @@ void Score::renderFrame(uint16 frameId, RenderMode mode) {
g_director->setPalette(resolvePaletteId(currentPalette));
}
- _window->render();
+ if (mode != kRenderNoWindowRender)
+ _window->render();
if (_frames[frameId]->_sound1 || _frames[frameId]->_sound2)
playSoundChannel(frameId);
diff --git a/engines/director/score.h b/engines/director/score.h
index edf5f07d08..37f5356374 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -57,7 +57,8 @@ enum RenderMode {
kRenderModeNormal,
kRenderForceUpdate,
kRenderUpdateStageOnly,
- kRenderNoUnrender
+ kRenderNoUnrender,
+ kRenderNoWindowRender
};
class Score {
More information about the Scummvm-git-logs
mailing list