[Scummvm-cvs-logs] scummvm master -> 4b83ce3800c0ecad8fa34687a4fa59e85737c835

[salty-horse]

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

Summary:
1acbfe8889 TUCKER: Remove errant loop increment (confirmed by cyx)
4b83ce3800 TUCKER: Allow skipping and quitting from cutscene loops


Commit: 1acbfe888948a202ff4061071d97e3f1bb33fde1
    https://github.com/scummvm/scummvm/commit/1acbfe888948a202ff4061071d97e3f1bb33fde1
Author: Ori Avtalion (ori at avtalion.name)
Date: 2016-02-22T00:44:19+02:00

Commit Message:
TUCKER: Remove errant loop increment (confirmed by cyx)

Changed paths:
    engines/tucker/sequences.cpp



diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index d9f284e..1591a95 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -290,7 +290,6 @@ void TuckerEngine::handleMeanwhileSequence() {
 		_fullRedraw = true;
 		redrawScreen(0);
 		waitForTimer(3);
-		++i;
 	}
 	do {
 		if (_fadePaletteCounter > 0) {


Commit: 4b83ce3800c0ecad8fa34687a4fa59e85737c835
    https://github.com/scummvm/scummvm/commit/4b83ce3800c0ecad8fa34687a4fa59e85737c835
Author: Ori Avtalion (ori at avtalion.name)
Date: 2016-02-22T00:47:05+02:00

Commit Message:
TUCKER: Allow skipping and quitting from cutscene loops

Changed paths:
    engines/tucker/sequences.cpp



diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index 1591a95..e2a25b3 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -244,7 +244,7 @@ void TuckerEngine::handleNewPartSequence() {
 			_inputKeys[kInputKeyEscape] = false;
 			break;
 		}
-	} while (isSpeechSoundPlaying());
+	} while (isSpeechSoundPlaying() && !_quitGame);
 	stopSpeechSound();
 	do {
 		if (_fadePaletteCounter > 0) {
@@ -257,7 +257,7 @@ void TuckerEngine::handleNewPartSequence() {
 		drawSprite(0);
 		redrawScreen(0);
 		waitForTimer(3);
-	} while (_fadePaletteCounter > 0);
+	} while (_fadePaletteCounter > 0 && !_quitGame);
 	_locationNum = currentLocation;
 }
 
@@ -281,7 +281,7 @@ void TuckerEngine::handleMeanwhileSequence() {
 	}
 	loadImage(filename, _quadBackgroundGfxBuf + 89600, 1);
 	_fadePaletteCounter = 0;
-	for (int i = 0; i < 60; ++i) {
+	for (int i = 0; i < 60 && !_quitGame; ++i) {
 		if (_fadePaletteCounter < 16) {
 			fadeOutPalette();
 			++_fadePaletteCounter;
@@ -290,6 +290,10 @@ void TuckerEngine::handleMeanwhileSequence() {
 		_fullRedraw = true;
 		redrawScreen(0);
 		waitForTimer(3);
+		if (_inputKeys[kInputKeyEscape]) {
+			_inputKeys[kInputKeyEscape] = false;
+			break;
+		}
 	}
 	do {
 		if (_fadePaletteCounter > 0) {
@@ -300,7 +304,7 @@ void TuckerEngine::handleMeanwhileSequence() {
 		_fullRedraw = true;
 		redrawScreen(0);
 		waitForTimer(3);
-	} while (_fadePaletteCounter > 0);
+	} while (_fadePaletteCounter > 0 && !_quitGame);
 	memcpy(_currentPalette, backupPalette, 256 * 3);
 	_fullRedraw = true;
 }