diff options
author | Filippos Karapetis | 2015-05-12 00:29:20 +0300 |
---|---|---|
committer | Filippos Karapetis | 2015-05-12 00:29:20 +0300 |
commit | 2e41909020ef2ccaf705f68737864fe50e31ef48 (patch) | |
tree | 1ea1810ac29160b64407dc614799a24453dd54e4 /engines | |
parent | fc2ac47eabfa745a23cc97259d4f624caa916a59 (diff) | |
download | scummvm-rg350-2e41909020ef2ccaf705f68737864fe50e31ef48.tar.gz scummvm-rg350-2e41909020ef2ccaf705f68737864fe50e31ef48.tar.bz2 scummvm-rg350-2e41909020ef2ccaf705f68737864fe50e31ef48.zip |
QUEEN: Immediately stop actor movement when the game is exiting
This allows the engine to quit immediately while actors are moving,
e.g. while Joe is walking towards Lola's bedroom
Diffstat (limited to 'engines')
-rw-r--r-- | engines/queen/walk.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/queen/walk.cpp b/engines/queen/walk.cpp index dd7e46c765..17d12b0b9f 100644 --- a/engines/queen/walk.cpp +++ b/engines/queen/walk.cpp @@ -130,7 +130,7 @@ void Walk::animateJoe() { _vm->logic()->joeScale(pbs->scale); pbs->scaleWalkSpeed(6); _vm->update(true); - if (_vm->input()->cutawayQuit() || _vm->logic()->joeWalk() == JWM_EXECUTE) { + if (_vm->input()->cutawayQuit() || _vm->logic()->joeWalk() == JWM_EXECUTE || _vm->shouldQuit()) { stopJoe(); break; } @@ -249,7 +249,7 @@ void Walk::animatePerson(const MovePersonData *mpd, uint16 image, uint16 bobNum, _vm->update(); pbs->scale = pwd->area->calcScale(pbs->y); pbs->scaleWalkSpeed(mpd->moveSpeed); - if (_vm->input()->cutawayQuit()) { + if (_vm->input()->cutawayQuit() || _vm->shouldQuit()) { stopPerson(bobNum); break; } |