aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2014-12-08 23:13:42 -0500
committerPaul Gilbert2014-12-12 23:04:24 -0500
commitc69480f6bf6f7afd6f0cffb0a6a76e22ad8e08cf (patch)
treed1f99bd171ff35a5734c264f312ef483dcd02b46 /engines
parentb20c755f46b34906305c773d1e4e320d0d8affbe (diff)
downloadscummvm-rg350-c69480f6bf6f7afd6f0cffb0a6a76e22ad8e08cf.tar.gz
scummvm-rg350-c69480f6bf6f7afd6f0cffb0a6a76e22ad8e08cf.tar.bz2
scummvm-rg350-c69480f6bf6f7afd6f0cffb0a6a76e22ad8e08cf.zip
ACCESS: Fix event pollig in death flashing loop
Diffstat (limited to 'engines')
-rw-r--r--engines/access/amazon/amazon_game.cpp1
-rw-r--r--engines/access/amazon/amazon_logic.cpp3
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index b425fe9e22..9880b65b69 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -640,6 +640,7 @@ void AmazonEngine::dead(int deathId) {
_sound->playSound(0);
_screen->forceFadeOut();
+ _events->pollEvents();
if (shouldQuit())
return;
}
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 952809f11f..01450077bd 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1475,8 +1475,7 @@ void River::initRiver() {
void River::resetPositions() {
riverSetPhysX();
int val = (_vm->_screen->_scrollCol + 1 - _oldScrollCol) * 16;
- if (val > 256) {
- val &= 0x7F;
+ if (val < 0) {
val |= 0x80;
}