[Scummvm-cvs-logs] SF.net SVN: scummvm: [31156] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31156
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31156&view=rev
Author:   lordhoto
Date:     2008-03-17 11:19:01 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
Also allow '.' and Escape as keys for skipping sequences in HoF.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v1.cpp
    scummvm/trunk/engines/kyra/kyra_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-03-17 18:13:28 UTC (rev 31155)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-03-17 18:19:01 UTC (rev 31156)
@@ -491,9 +491,9 @@
 						_debugger->attach();
 					else if (event.kbd.keycode == 'q')
 						_quitFlag = true;
-				} else if (event.kbd.keycode == '.')
-						_skipFlag = true;
-				else if (event.kbd.keycode == Common::KEYCODE_RETURN || event.kbd.keycode == Common::KEYCODE_SPACE || event.kbd.keycode == Common::KEYCODE_ESCAPE) {
+				} else if (event.kbd.keycode == '.') {
+					_skipFlag = true;
+				} else if (event.kbd.keycode == Common::KEYCODE_RETURN || event.kbd.keycode == Common::KEYCODE_SPACE || event.kbd.keycode == Common::KEYCODE_ESCAPE) {
 					_abortIntroFlag = true;
 					_skipFlag = true;
 				}

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-17 18:13:28 UTC (rev 31155)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-17 18:19:01 UTC (rev 31156)
@@ -731,6 +731,15 @@
 			_quitFlag = true;
 			break;
 
+		case Common::EVENT_KEYDOWN:
+			if (event.kbd.keycode == '.' || event.kbd.keycode == Common::KEYCODE_ESCAPE)
+				_eventList.push_back(Event(event, true));
+			else if (event.kbd.keycode == 'q' && event.kbd.flags == Common::KBD_CTRL)
+				_quitFlag = true;
+			else
+				_eventList.push_back(event);
+			break;
+
 		case Common::EVENT_LBUTTONUP:
 			_eventList.push_back(Event(event, true));
 			break;
@@ -768,6 +777,7 @@
 				if (event.kbd.keycode == 'd')
 					_debugger->attach();
 			}
+
 			breakLoop = true;
 			break;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.