aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Snover2016-07-26 18:49:42 -0500
committerColin Snover2016-07-27 08:49:56 -0500
commit4dc3b046c3c32487ffaaf7107959d9869d04680d (patch)
tree9ff2a7a3ddc896897f62927582ca8ab5d9bdc7b3
parent272505fec1455c116486b6a2248a1821c7baf09c (diff)
downloadscummvm-rg350-4dc3b046c3c32487ffaaf7107959d9869d04680d.tar.gz
scummvm-rg350-4dc3b046c3c32487ffaaf7107959d9869d04680d.tar.bz2
scummvm-rg350-4dc3b046c3c32487ffaaf7107959d9869d04680d.zip
SCI32: Fix kShowMovie calls crashing SCI32
This will all be overhauled in the future but for now it is best not to crash when playing AVI/SEQ files.
-rw-r--r--engines/sci/engine/kvideo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp
index 1096e78cca..de4d4a282c 100644
--- a/engines/sci/engine/kvideo.cpp
+++ b/engines/sci/engine/kvideo.cpp
@@ -230,7 +230,7 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) {
// We also won't be copying the screen to the SCI screen...
if (g_system->getScreenFormat().bytesPerPixel != 1)
initGraphics(screenWidth, screenHeight, screenWidth > 320);
- else {
+ else if (getSciVersion() < SCI_VERSION_2) {
g_sci->_gfxScreen->kernelSyncWithFramebuffer();
g_sci->_gfxPalette16->kernelSyncScreenPalette();
}