diff options
author | Strangerke | 2016-05-19 07:59:07 +0200 |
---|---|---|
committer | Strangerke | 2016-05-19 07:59:07 +0200 |
commit | 9a2bc3c5720e807978fa8a302b5b3c532fb62d30 (patch) | |
tree | 8349a4075ab73882286d48955c14bca9353a3e25 /engines/gnap/scenes/group4.cpp | |
parent | 97ac77b5f1b41b77b5e9a79bac0f6a11a4063386 (diff) | |
download | scummvm-rg350-9a2bc3c5720e807978fa8a302b5b3c532fb62d30.tar.gz scummvm-rg350-9a2bc3c5720e807978fa8a302b5b3c532fb62d30.tar.bz2 scummvm-rg350-9a2bc3c5720e807978fa8a302b5b3c532fb62d30.zip |
GNAP: Add several checks on _gameDone in order to quit the game quickly
Diffstat (limited to 'engines/gnap/scenes/group4.cpp')
-rw-r--r-- | engines/gnap/scenes/group4.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp index 810e4bfdfc..7a5de8d37e 100644 --- a/engines/gnap/scenes/group4.cpp +++ b/engines/gnap/scenes/group4.cpp @@ -1139,7 +1139,7 @@ void Scene42::updateAnimations() { _vm->addFullScreenSprite(0x13E, 255); gameSys.setAnimation(0x151, 256, 0); gameSys.insertSequence(0x151, 256, 0, 0, kSeqNone, 0, 0, 0); - while (gameSys.getAnimationStatus(0) != 2) + while (gameSys.getAnimationStatus(0) != 2 && !_vm->_gameDone) _vm->gameUpdateTick(); _vm->removeFullScreenSprite(); _vm->showCursor(); @@ -2189,7 +2189,7 @@ void Scene45::run() { _vm->setGrabCursorSprite(-1); gameSys.setAnimation(0x9D, gnap._id, 0); gameSys.insertSequence(0x9D, gnap._id, makeRid(gnap._sequenceDatNum, gnap._sequenceId), gnap._id, kSeqSyncWait, 0, 0, 0); - while (gameSys.getAnimationStatus(0) != 2) { + while (gameSys.getAnimationStatus(0) != 2 && !_vm->_gameDone) { _vm->gameUpdateTick(); if (gameSys.getAnimationStatus(2) == 2) { gameSys.setAnimation(0, 0, 2); @@ -2211,7 +2211,7 @@ void Scene45::run() { _vm->addFullScreenSprite(0x8A, 255); gameSys.setAnimation(0xA0, 256, 0); gameSys.insertSequence(0xA0, 256, 0, 0, kSeqNone, 0, 0, 0); - while (gameSys.getAnimationStatus(0) != 2) + while (gameSys.getAnimationStatus(0) != 2 && !_vm->_gameDone) _vm->gameUpdateTick(); gameSys.setAnimation(0x107BD, gnap._id, 0); gameSys.insertSequence(0x107BD, gnap._id, |