[Scummvm-cvs-logs] scummvm master -> 9f8520fb81810f6ce7718bde2fd4fc6a13e4c45d

[fuzzie]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9f8520fb81 QUEEN: Fix clicking at the pinnacle.


Commit: 9f8520fb81810f6ce7718bde2fd4fc6a13e4c45d
    https://github.com/scummvm/scummvm/commit/9f8520fb81810f6ce7718bde2fd4fc6a13e4c45d
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2012-02-04T10:49:52-08:00

Commit Message:
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.

Changed paths:
    engines/queen/logic.cpp



diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp
index f60ac59..6d90254 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();