[Scummvm-cvs-logs] SF.net SVN: scummvm: [27777] scummvm/trunk/engines/scumm/input.cpp

[fingolfin at users.sourceforge.net]

Revision: 27777
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27777&view=rev
Author:   fingolfin
Date:     2007-06-29 15:39:52 -0700 (Fri, 29 Jun 2007)

Log Message:
-----------
SCUMM: Handle all triggers for the debugger console in the same spot, to ensure uniform behavior

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/input.cpp

Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp	2007-06-29 22:36:56 UTC (rev 27776)
+++ scummvm/trunk/engines/scumm/input.cpp	2007-06-29 22:39:52 UTC (rev 27777)
@@ -79,7 +79,8 @@
 				_fastMode ^= 1;
 			} else if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 'g') {
 				_fastMode ^= 2;
-			} else if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 'd') {
+			} else if ((event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 'd') ||
+					event.kbd.ascii == '~' || event.kbd.ascii == '#') {
 				_debugger->attach();
 			} else if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 's') {
 				_res->resourceStats();
@@ -559,9 +560,6 @@
 		if (VAR_CHARINC != 0xFF)
 			VAR(VAR_CHARINC) = _defaultTalkDelay;
 
-	} else if (lastKeyHit.ascii == '~' || lastKeyHit.ascii == '#') { // Debug console
-		_debugger->attach();
-
 	} else {
 		// FIXME: Possibly convert even more keycode/ascii pairs to their SCUMM counterparts?
 		if (lastKeyHit.keycode >= Common::KEYCODE_F1 && lastKeyHit.keycode <= Common::KEYCODE_F9) {


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