[Scummvm-cvs-logs] scummvm master -> 0db09d334ca1be244aa6b5865ff92919456c669f

[bluegr]

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:
0db09d334c QUEEN: Fix bug #6700 - "FOTAQ: Weird Response Glitches"


Commit: 0db09d334ca1be244aa6b5865ff92919456c669f
    https://github.com/scummvm/scummvm/commit/0db09d334ca1be244aa6b5865ff92919456c669f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-10-27T03:18:41+02:00

Commit Message:
QUEEN: Fix bug #6700 - "FOTAQ: Weird Response Glitches"

Pending mouse clicks and keypresses are now cleared before and after
the game options screen or dialog options are shown

Changed paths:
    engines/queen/logic.cpp
    engines/queen/talk.cpp



diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp
index d48bb8a..664a9a1 100644
--- a/engines/queen/logic.cpp
+++ b/engines/queen/logic.cpp
@@ -2115,9 +2115,15 @@ void LogicInterview::setupSpecialMoveTable() {
 }
 
 void LogicGame::useJournal() {
+	_vm->input()->clearKeyVerb();
+	_vm->input()->clearMouseButton();
+
 	_vm->command()->clear(false);
 	_journal->use();
 	_vm->walk()->stopJoe();
+
+	_vm->input()->clearKeyVerb();
+	_vm->input()->clearMouseButton();
 }
 
 bool LogicGame::changeToSpecialRoom() {
diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index 1b9d72b..d00e64b 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -1250,6 +1250,7 @@ int16 Talk::selectSentence() {
 		}
 
 		_vm->input()->clearKeyVerb();
+		_vm->input()->clearMouseButton();
 
 		if (sentenceCount > 0) {
 			int oldZone = 0;
@@ -1328,6 +1329,9 @@ int16 Talk::selectSentence() {
 		}
 	}
 
+	_vm->input()->clearKeyVerb();
+	_vm->input()->clearMouseButton();
+
 	debug(6, "Selected sentence %i", selectedSentence);
 
 	arrowBobUp->active    = false;