[Scummvm-git-logs] scummvm master -> 842c67fc34fdc1ff932c8cf70c768e6ad8157038

[bonki]

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:
842c67fc34 TUCKER: Allow skipping speech


Commit: 842c67fc34fdc1ff932c8cf70c768e6ad8157038
    https://github.com/scummvm/scummvm/commit/842c67fc34fdc1ff932c8cf70c768e6ad8157038
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-02-25T20:15:25+01:00

Commit Message:
TUCKER: Allow skipping speech

Escape, period or right mouse click skips one sentence at a time.

Changed paths:
    engines/tucker/tucker.cpp
    engines/tucker/tucker.h


diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index d4640a8..8e11e22 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -653,6 +653,10 @@ void TuckerEngine::parseEvents() {
 				break;
 			case Common::KEYCODE_ESCAPE:
 				_inputKeys[kInputKeyEscape] = true;
+				_inputKeys[kInputKeySkipSpeech] = true;
+				break;
+			case Common::KEYCODE_PERIOD:
+				_inputKeys[kInputKeySkipSpeech] = true;
 				break;
 			case Common::KEYCODE_d:
 				if (ev.kbd.hasFlags(Common::KBD_CTRL)) {
@@ -678,6 +682,7 @@ void TuckerEngine::parseEvents() {
 		case Common::EVENT_RBUTTONDOWN:
 			updateCursorPos(ev.mouse.x, ev.mouse.y);
 			_mouseButtonsMask |= 2;
+			_inputKeys[kInputKeySkipSpeech] = true;
 			break;
 		case Common::EVENT_RBUTTONUP:
 			updateCursorPos(ev.mouse.x, ev.mouse.y);
@@ -692,6 +697,12 @@ void TuckerEngine::parseEvents() {
 			break;
 		}
 	}
+	if (_inputKeys[kInputKeySkipSpeech]) {
+		if (isSpeechSoundPlaying()) {
+			stopSpeechSound();
+		}
+		_inputKeys[kInputKeySkipSpeech] = false;
+	}
 	_quitGame = shouldQuit();
 }
 
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index fd508c1..d458d80 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -212,7 +212,8 @@ enum InputKey {
 	kInputKeyToggleInventory,
 	kInputKeyToggleTextSpeech,
 	kInputKeyHelp,
-	kInputKeyCount
+	kInputKeyCount,
+	kInputKeySkipSpeech
 };
 
 enum GameFlag {