diff options
| author | Sven Hesse | 2008-05-04 01:02:27 +0000 |
|---|---|---|
| committer | Sven Hesse | 2008-05-04 01:02:27 +0000 |
| commit | 001adf1bb3dd354a9f383f261a8595300f218e8a (patch) | |
| tree | 768cbff1bd7a589b2f1a8f864280b1840becc971 /engines | |
| parent | db04dd427d51aca647d68eb5a688273ee16f2fea (diff) | |
| download | scummvm-rg350-001adf1bb3dd354a9f383f261a8595300f218e8a.tar.gz scummvm-rg350-001adf1bb3dd354a9f383f261a8595300f218e8a.tar.bz2 scummvm-rg350-001adf1bb3dd354a9f383f261a8595300f218e8a.zip | |
Enabled scrolling in Woodruff
svn-id: r31855
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/gob/game.cpp | 3 | ||||
| -rw-r--r-- | engines/gob/util.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp index 1d5ce65999..666f46fde1 100644 --- a/engines/gob/game.cpp +++ b/engines/gob/game.cpp @@ -311,7 +311,8 @@ void Game::evaluateScroll(int16 x, int16 y) { if (_preventScroll || !_scrollHandleMouse || (_menuLevel > 0)) return; - if (_noScroll || (_vm->_global->_videoMode != 0x14)) + if (_noScroll || + ((_vm->_global->_videoMode != 0x14) && (_vm->_global->_videoMode != 0x18))) return; if ((x == 0) && (_vm->_draw->_scrollOffsetX > 0)) { diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp index 3b6a898a60..8e573ddb1a 100644 --- a/engines/gob/util.cpp +++ b/engines/gob/util.cpp @@ -132,7 +132,10 @@ void Util::processInput(bool scroll) { x = CLIP(x, _vm->_global->_mouseMinX, _vm->_global->_mouseMaxX); y = CLIP(y, _vm->_global->_mouseMinY, _vm->_global->_mouseMaxY); - _vm->_util->setMousePos(x - _vm->_video->_screenDeltaX, y - _vm->_video->_screenDeltaY); + x -= _vm->_video->_screenDeltaX; + y -= _vm->_video->_screenDeltaY; + + _vm->_util->setMousePos(x, y); _vm->_game->evaluateScroll(x, y); } } |