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/group5.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/group5.cpp')
| -rw-r--r-- | engines/gnap/scenes/group5.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/engines/gnap/scenes/group5.cpp b/engines/gnap/scenes/group5.cpp index 2788a43ac1..a359da21db 100644 --- a/engines/gnap/scenes/group5.cpp +++ b/engines/gnap/scenes/group5.cpp @@ -89,8 +89,7 @@ int Scene53::pressPhoneNumberButton(int phoneNumber, int buttonNum) { } gnap._actionStatus = 6; - while (gameSys.getAnimationStatus(6) != 2) { - // checkGameAppStatus(); + while (gameSys.getAnimationStatus(6) != 2 && !_vm->_gameDone) { _vm->updateMouseCursor(); _vm->gameUpdateTick(); } @@ -141,9 +140,8 @@ void Scene53::runRandomCall() { } gnap._actionStatus = 1; - while (gameSys.getAnimationStatus(6) != 2) { + while (gameSys.getAnimationStatus(6) != 2 && !_vm->_gameDone) { _vm->updateMouseCursor(); - // checkGameAppStatus(); _vm->gameUpdateTick(); } gnap._actionStatus = -1; @@ -159,9 +157,8 @@ void Scene53::runChitChatLine() { gameSys.insertSequence(0x6E, 1, 0, 0, kSeqNone, 16, 0, 0); gnap._actionStatus = 1; - while (gameSys.getAnimationStatus(6) != 2) { + while (gameSys.getAnimationStatus(6) != 2 && !_vm->_gameDone) { _vm->updateMouseCursor(); - // checkGameAppStatus(); _vm->gameUpdateTick(); } gnap._actionStatus = -1; @@ -225,18 +222,16 @@ void Scene53::runChitChatLine() { gameSys.setAnimation(sequenceId, 1, 6); gameSys.insertSequence(sequenceId, 1, 0, 0, kSeqNone, 16, 0, 0); gnap._actionStatus = 1; - while (gameSys.getAnimationStatus(6) != 2) { + while (gameSys.getAnimationStatus(6) != 2 && !_vm->_gameDone) { _vm->updateMouseCursor(); - // checkGameAppStatus(); _vm->gameUpdateTick(); } gnap._actionStatus = -1; gameSys.setAnimation(0x72, 1, 6); gameSys.insertSequence(0x72, 1, 0, 0, kSeqNone, 16, 0, 0); gnap._actionStatus = 1; - while (gameSys.getAnimationStatus(6) != 2) { + while (gameSys.getAnimationStatus(6) != 2 && !_vm->_gameDone) { _vm->updateMouseCursor(); - // checkGameAppStatus(); _vm->gameUpdateTick(); } gnap._actionStatus = -1; @@ -250,9 +245,8 @@ void Scene53::runChitChatLine() { if (_vm->isFlag(kGFSpringTaken)) { gameSys.setAnimation(0x73, 40, 6); gameSys.insertSequence(0x73, 40, _currHandSequenceId, 40, kSeqSyncWait, 0, 0, 0); - while (gameSys.getAnimationStatus(6) != 2) { + while (gameSys.getAnimationStatus(6) != 2 && !_vm->_gameDone) { _vm->updateMouseCursor(); - // checkGameAppStatus(); _vm->gameUpdateTick(); } _currHandSequenceId = 0x73; @@ -317,9 +311,8 @@ void Scene53::run() { if (_vm->isFlag(kGFSpringTaken)) { gameSys.setAnimation(0x73, 40, 6); gameSys.insertSequence(0x73, 40, _currHandSequenceId, 40, kSeqSyncWait, 0, 0, 0); - while (gameSys.getAnimationStatus(6) != 2) { + while (gameSys.getAnimationStatus(6) != 2 && !_vm->_gameDone) { _vm->updateMouseCursor(); - // checkGameAppStatus(); _vm->gameUpdateTick(); } _currHandSequenceId = 0x73; @@ -359,9 +352,8 @@ void Scene53::run() { if (_vm->isFlag(kGFSpringTaken)) { gameSys.setAnimation(0x73, 40, 6); gameSys.insertSequence(0x73, 40, _currHandSequenceId, 40, kSeqSyncWait, 0, 0, 0); - while (gameSys.getAnimationStatus(6) != 2) { + while (gameSys.getAnimationStatus(6) != 2 && !_vm->_gameDone) { _vm->updateMouseCursor(); - // checkGameAppStatus(); _vm->gameUpdateTick(); } _currHandSequenceId = 0x73; |