[Scummvm-cvs-logs] scummvm master -> 972ebc0c757ac76cd4fa7b742de0bbd5f9058a7a

[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:
972ebc0c75 DREAMWEB: Allow skipping the mad man sequence with the ESC key


Commit: 972ebc0c757ac76cd4fa7b742de0bbd5f9058a7a
    https://github.com/scummvm/scummvm/commit/972ebc0c757ac76cd4fa7b742de0bbd5f9058a7a
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-28T10:15:08-08:00

Commit Message:
DREAMWEB: Allow skipping the mad man sequence with the ESC key

Changed paths:
    engines/dreamweb/people.cpp



diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 6745a34..98f36a9 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -186,8 +186,13 @@ void DreamWebEngine::madman(ReelRoutine &routine) {
 		}
 		if (newReelPointer == 66) {
 			++_vars._combatCount;
+
+			if (_lastHardKey == 1)	// ESC pressed, skip the mad man's speech
+				_vars._combatCount = _speechCount = (hasSpeech() ? 65 : 63);
+
 			madmanText();
 			newReelPointer = 53;
+
 			if (_vars._combatCount >= (hasSpeech() ? 64 : 62)) {
 				if (_vars._combatCount == (hasSpeech() ? 70 : 68))
 					newReelPointer = 310;