diff options
| author | Paul Gilbert | 2014-11-27 22:27:09 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-12-12 22:49:26 -0500 |
| commit | c6042e2e2593f92ff0dc936fe34e6b933c284589 (patch) | |
| tree | e790891d60f79b7ac1588aeb5caf5f59acd54258 /engines/access | |
| parent | 3be3cb1ac21dcaf8f79907e9ce463c4828cba65c (diff) | |
| download | scummvm-rg350-c6042e2e2593f92ff0dc936fe34e6b933c284589.tar.gz scummvm-rg350-c6042e2e2593f92ff0dc936fe34e6b933c284589.tar.bz2 scummvm-rg350-c6042e2e2593f92ff0dc936fe34e6b933c284589.zip | |
ACCESS: Minor cleanups of canoe code
Diffstat (limited to 'engines/access')
| -rw-r--r-- | engines/access/amazon/amazon_scripts.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp index 537dd3094d..aa904716c2 100644 --- a/engines/access/amazon/amazon_scripts.cpp +++ b/engines/access/amazon/amazon_scripts.cpp @@ -1562,16 +1562,18 @@ void AmazonScripts::moveCanoe() { EventsManager &events = *_vm->_events; Common::Point pt = events.calcRawMouse(); - _vm->_events->pollEvents(); + events.pollEvents(); if (_game->_canoeDir) { // Canoe movement in progress moveCanoe2(); } else { - if (events._leftButton && pt.y < 180) { - if (RMOUSE[8][0] < pt.x) { + if (events._leftButton && pt.y >= 140) { + if (pt.x < RMOUSE[8][0]) { + // Disk icon wasn't clicked printString(BAR_MESSAGE); } else { + // Clicked on the Disc icon _game->_saveRiver = 1; _game->_rScrollRow = screen._scrollRow; _game->_rScrollCol = screen._scrollCol; @@ -1738,6 +1740,8 @@ void AmazonScripts::RIVER() { static const int RIVERDEATH[5] = {22, 23, 24, 25, 26}; initRiver(); + _vm->_events->showCursor(); + while (!_vm->shouldQuit()) { _vm->_events->_vbCount = 4; @@ -1787,14 +1791,11 @@ void AmazonScripts::RIVER() { return; } } - - if (_vm->_events->_mousePos.y >= 24 && _vm->_events->_mousePos.y <= 136) { - _vm->_events->hideCursor(); - scrollRiver1(); - _vm->_events->pollEvents(); - } else - scrollRiver1(); + // Scroll the river + scrollRiver1(); + + // Allow time for new scrolled river position to be shown while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0) { _vm->_events->pollEventsAndWait(); } |