aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/inter_v6.cpp
diff options
context:
space:
mode:
authorSven Hesse2009-08-08 21:43:07 +0000
committerSven Hesse2009-08-08 21:43:07 +0000
commit256a27350a1896137a4416eb5db26662c7fab2ee (patch)
tree272221a0b552a586e626e724bba40328afece93f /engines/gob/inter_v6.cpp
parentc0e7f926521b01af6459615a6844b52f202cb436 (diff)
downloadscummvm-rg350-256a27350a1896137a4416eb5db26662c7fab2ee.tar.gz
scummvm-rg350-256a27350a1896137a4416eb5db26662c7fab2ee.tar.bz2
scummvm-rg350-256a27350a1896137a4416eb5db26662c7fab2ee.zip
Changed the scroll-handling to be more like the original. This fixes bug #2832362 ("GOB3: Scrolling locked after cutscene")
svn-id: r43147
Diffstat (limited to 'engines/gob/inter_v6.cpp')
-rw-r--r--engines/gob/inter_v6.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index aa4721ff0a..4e2ec69cf2 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -164,12 +164,9 @@ void Inter_v6::o6_playVmdOrMusic() {
return;
}
- if (startFrame >= 0) {
- _vm->_game->_preventScroll = true;
+ if (startFrame >= 0)
_vm->_vidPlayer->primaryPlay(startFrame, lastFrame, breakKey,
palCmd, palStart, palEnd, 0, -1, false, -1, true);
- _vm->_game->_preventScroll = false;
- }
if (close)
_vm->_vidPlayer->primaryClose();