diff options
| author | Paul Gilbert | 2014-11-22 22:17:39 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-12-12 22:38:31 -0500 |
| commit | 30f602b6cb265000d4ac95e645598d324e3d5d49 (patch) | |
| tree | 7216d28ce7b533bd4f03c76de39ecb61b114f021 /engines/access/amazon | |
| parent | 1d60368724198d9c5fd201ab628ef46d285bb73b (diff) | |
| download | scummvm-rg350-30f602b6cb265000d4ac95e645598d324e3d5d49.tar.gz scummvm-rg350-30f602b6cb265000d4ac95e645598d324e3d5d49.tar.bz2 scummvm-rg350-30f602b6cb265000d4ac95e645598d324e3d5d49.zip | |
ACCESS: Further fixes for panning
Diffstat (limited to 'engines/access/amazon')
| -rw-r--r-- | engines/access/amazon/amazon_scripts.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp index d4018c2def..4d354017c6 100644 --- a/engines/access/amazon/amazon_scripts.cpp +++ b/engines/access/amazon/amazon_scripts.cpp @@ -425,11 +425,11 @@ void AmazonScripts::pan() { for (int i = 0; i < _pNumObj; i++) { _pObjZ[i] += _zTrack; _pObjXl[i] += (_pObjZ[i] * tx) & 0xff; - _pObjX[i] += (_pObjZ[i] * tx) >> 8 + (_pObjXl[i] >> 8); + _pObjX[i] += ((_pObjZ[i] * tx) >> 8) + (_pObjXl[i] >> 8); _pObjXl[i] &= 0xff; _pObjYl[i] += (_pObjZ[i] * ty) & 0xff; - _pObjY[i] += (_pObjZ[i] * ty) >> 8 + (_pObjYl[i] >> 8); + _pObjY[i] += ((_pObjZ[i] * ty) >> 8) + (_pObjYl[i] >> 8); _pObjYl[i] &= 0xff; } } @@ -697,8 +697,9 @@ void AmazonScripts::mWhileDoOpen() { _zCam = 270; _vm->_timers[24]._timer = _vm->_timers[24]._initTm = 1; ++_vm->_timers[24]._flag; - _pNumObj = 10; + _vm->_timers.updateTimers(); + _pNumObj = 10; for (int i = 0; i < _pNumObj; i++) { _pObject[i] = _vm->_objectsTable[1]; _pImgNum[i] = OPENING_OBJS[i][0]; @@ -731,7 +732,9 @@ void AmazonScripts::mWhileDoOpen() { screen.forceFadeIn(); } - events.pollEvents(); + events.pollEvents(); + g_system->delayMillis(10); + if (events._leftButton || events._rightButton || events._keypresses.size() > 0) { _game->_skipStart = true; _vm->_sound->newMusic(10, 1); |