Skip to content

Commit

Permalink
QUEEN: Immediately stop actor movement when the game is exiting
Browse files Browse the repository at this point in the history
This allows the engine to quit immediately while actors are moving,
e.g. while Joe is walking towards Lola's bedroom
  • Loading branch information
bluegr committed May 11, 2015
1 parent fc2ac47 commit 2e41909
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions engines/queen/walk.cpp
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 2e41909

Please sign in to comment.