diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/queen/logic.cpp | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/queen/logic.cpp')
| -rw-r--r-- | engines/queen/logic.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp index f60ac59ff1..6d90254608 100644 --- a/engines/queen/logic.cpp +++ b/engines/queen/logic.cpp @@ -1193,14 +1193,11 @@ void Logic::handlePinnacleRoom() { uint16 prevObj = 0; CmdText *cmdText = CmdText::makeCmdTextInstance(5, _vm); cmdText->setVerb(VERB_WALK_TO); - while (_vm->input()->mouseButton() == 0 || _entryObj == 0) { + while (!_vm->shouldQuit() && (_vm->input()->mouseButton() == 0 || _entryObj == 0)) { _vm->update(); mouse = _vm->input()->getMousePos(); - // update screen scrolling - _vm->display()->horizontalScroll(mouse.x); - // update bobs position / frame joe->x = piton->x = 3 * mouse.x / 4 + 200; joe->frameNum = mouse.x / 36 + 45; @@ -1218,6 +1215,9 @@ void Logic::handlePinnacleRoom() { } prevObj = curObj; } + + // update screen scrolling + _vm->display()->horizontalScroll(mouse.x); } delete cmdText; _vm->input()->clearMouseButton(); |