diff options
author | Sven Hesse | 2007-05-30 10:20:21 +0000 |
---|---|---|
committer | Sven Hesse | 2007-05-30 10:20:21 +0000 |
commit | 0504f18e9f2a4d03f4b5ce7cfb60cd7a2a383a42 (patch) | |
tree | 55d319fc76810e56433ba53043852d2ec73ed8f3 /engines/gob/inter_v2.cpp | |
parent | 39fafdc3033e4d1e5b8a8505cfcfbfe3affc7b8f (diff) | |
download | scummvm-rg350-0504f18e9f2a4d03f4b5ce7cfb60cd7a2a383a42.tar.gz scummvm-rg350-0504f18e9f2a4d03f4b5ce7cfb60cd7a2a383a42.tar.bz2 scummvm-rg350-0504f18e9f2a4d03f4b5ce7cfb60cd7a2a383a42.zip |
- Added a workaround for bug #1705338 (Seg fault when trying to switch screen in music land) which is actually a script bug.
- Fixed the scrolling bug (#1709574) (the mouse cursor is still shown, that's an instance of the global cursor visibility issue)
svn-id: r27010
Diffstat (limited to 'engines/gob/inter_v2.cpp')
-rw-r--r-- | engines/gob/inter_v2.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index 78ea9cab7a..331be9fdda 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -1492,6 +1492,7 @@ void Inter_v2::o2_playImd() { close = false; } + _vm->_game->_preventScroll = true; for (int i = startFrame; i <= lastFrame; i++) { _vm->_imdPlayer->play(i, palCmd, palStart, palEnd, 0, lastFrame); WRITE_VAR(11, i); @@ -1507,10 +1508,12 @@ void Inter_v2::o2_playImd() { if (VAR(0) == (unsigned) breakKey) { if (_vm->_imdPlayer->_soundStage == 2) _vm->_snd->stopSound(0); + _vm->_game->_preventScroll = false; return; } } } + _vm->_game->_preventScroll = false; if (close) _vm->_imdPlayer->closeImd(); |