QUEEN: Fix clicking at the pinnacle.

Check where the click was *before* scrolling the view, so that
it works with a touchscreen. Also, check shouldQuit() here.
This commit is contained in:
Alyssa Milburn 2012-02-04 19:49:49 +01:00
parent 38b8e09069
commit 9f8520fb81

View File

@ -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();