aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2014-12-01 15:18:21 +0100
committerPaul Gilbert2014-12-12 22:55:30 -0500
commit0eeb5b5bf3e6dfe5537647068f697eedda87c468 (patch)
treee2606f0a5e7eb6a37e49cd127036064f381e9f6e
parent0028556d6c1706f647f0df3fddd04adb87bd6630 (diff)
downloadscummvm-rg350-0eeb5b5bf3e6dfe5537647068f697eedda87c468.tar.gz
scummvm-rg350-0eeb5b5bf3e6dfe5537647068f697eedda87c468.tar.bz2
scummvm-rg350-0eeb5b5bf3e6dfe5537647068f697eedda87c468.zip
ACCESS: Fix the horizontal scrolling in intro, add some calls to clearEvents
-rw-r--r--engines/access/amazon/amazon_logic.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 5db3efbecb..1649cddc51 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -372,12 +372,12 @@ void Opening::doTitle() {
_vm->_screen->forceFadeIn();
_vm->_oldRects.clear();
_vm->_newRects.clear();
- // KEYFLG = 0;
+ _vm->_events->clearEvents();
_vm->_player->_scrollAmount = 1;
_pCount = 0;
while (!_vm->shouldQuit()) {
- if (!_vm->_events->isKeyMousePressed()) {
+ if (_vm->_events->isKeyMousePressed()) {
if (_vm->_events->_rightButton)
_skipStart = true;
_vm->_room->clearRoom();
@@ -616,8 +616,7 @@ void Plane::mWhileFly() {
screen.fadeIn();
_vm->_oldRects.clear();
_vm->_newRects.clear();
-
- // KEYFLG = 0;
+ _vm->_events->clearEvents();
screen._scrollRow = screen._scrollCol = 0;
screen._scrollX = screen._scrollY = 0;
@@ -673,8 +672,7 @@ void Plane::mWhileFall() {
screen.fadeIn();
_vm->_oldRects.clear();
_vm->_newRects.clear();
-
- // KEYFLG = 0;
+ _vm->_events->clearEvents();
screen._scrollRow = screen._scrollCol = 0;
screen._scrollX = screen._scrollY = 0;
@@ -768,7 +766,7 @@ void Jungle::initJWalk2() {
_vm->_room->buildScreen();
_vm->copyBF2Vid();
_vm->_screen->fadeIn();
- // KEYFL = 0;
+ _vm->_events->clearEvents();
_xCount = 2;
_vm->_player->_scrollAmount = 5;
@@ -1395,7 +1393,8 @@ void River::initRiver() {
// Reset draw rects
_vm->_oldRects.clear();
_vm->_newRects.clear();
- // KEYFLG = 0
+ _vm->_events->clearEvents();
+
}
_vm->_player->_scrollAmount = 2;