[Scummvm-git-logs] scummvm master -> 0377045f0e27d60a5488bbc095b42866104f801d

[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:
0377045f0e QUEEN: Skip talk on right click


Commit: 0377045f0e27d60a5488bbc095b42866104f801d
    https://github.com/scummvm/scummvm/commit/0377045f0e27d60a5488bbc095b42866104f801d
Author: Niv Baehr (bloop93 at gmail.com)
Date: 2019-07-30T22:25:14+03:00

Commit Message:
QUEEN: Skip talk on right click

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


diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp
index 1cce9ad..4c400fb 100644
--- a/engines/queen/input.cpp
+++ b/engines/queen/input.cpp
@@ -111,15 +111,22 @@ void Input::delay(uint amount) {
 
 			case Common::EVENT_LBUTTONDOWN:
 				_mouseButton |= MOUSE_LBUTTON;
+				if (_dialogueRunning)
+					_talkQuit = true;
 				break;
 
 			case Common::EVENT_RBUTTONDOWN:
 				_mouseButton |= MOUSE_RBUTTON;
+				if (_dialogueRunning)
+					_talkQuit = true;
 				break;
 			case Common::EVENT_RTL:
 			case Common::EVENT_QUIT:
 				if (_cutawayRunning)
 					_cutawayQuit = true;
+				// Allow using close button while dialogue is running
+				if (_dialogueRunning)
+					_talkQuit = true;
 				return;
 
 			default:
diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index e86a53d..b7f61ad 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -734,8 +734,10 @@ void Talk::defaultAnimation(
 				_vm->update();
 			}
 
-			if (_vm->input()->talkQuit())
+			if (_vm->input()->talkQuit()) {
+				_vm->sound()->stopSpeech();
 				break;
+			}
 
 			if (_vm->logic()->joeWalk() == JWM_SPEAK) {
 				_vm->update();