[Scummvm-cvs-logs] scummvm master -> 22263bd763c5d31c562bf0da8986e057103dd3fe

Strangerke Strangerke at scummvm.org
Wed Nov 30 21:22:12 CET 2011


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:
22263bd763 CGE: Only skips animations when pressing ESC.


Commit: 22263bd763c5d31c562bf0da8986e057103dd3fe
    https://github.com/scummvm/scummvm/commit/22263bd763c5d31c562bf0da8986e057103dd3fe
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-11-30T12:21:34-08:00

Commit Message:
CGE: Only skips animations when pressing ESC.

This should allow tsoliman to see the end of the intro

Changed paths:
    engines/cge/cge_main.cpp



diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 5af52cd..c67356e 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -757,12 +757,14 @@ void System::touch(uint16 mask, int x, int y) {
 	funTouch();
 
 	if (mask & kEventKeyb) {
-		// The original was calling keyClick() 
-		// The sound is uselessly annoying and noisy, so it has been removed
-		_vm->killText();
-		if (_vm->_startupMode == 1) {
-			_vm->_commandHandler->addCommand(kCmdClear, -1, 0, NULL);
-			return;
+		if (x == Common::KEYCODE_ESCAPE) {
+			// The original was calling keyClick() 
+			// The sound is uselessly annoying and noisy, so it has been removed
+			_vm->killText();
+			if (_vm->_startupMode == 1) {
+				_vm->_commandHandler->addCommand(kCmdClear, -1, 0, NULL);
+				return;
+			}
 		}
 	} else {
 		if (_vm->_startupMode)






More information about the Scummvm-git-logs mailing list