[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.130,1.131

[kirben]

Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9071/kyra

Modified Files:
	kyra.cpp 
Log Message:

Make debug key consistent.


Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- kyra.cpp	21 Jan 2006 18:43:17 -0000	1.130
+++ kyra.cpp	21 Jan 2006 23:43:58 -0000	1.131
@@ -590,8 +590,6 @@
 			case OSystem::EVENT_KEYDOWN:
 				if (event.kbd.keycode == 'q') {
 					_quitFlag = true;
-				} else if (event.kbd.keycode == 'd' && !_debugger->isAttached()) {
-					_debugger->attach();
 				} else if (event.kbd.keycode >= '0' && event.kbd.keycode <= '9' && 
 						(event.kbd.flags == OSystem::KBD_CTRL || event.kbd.flags == OSystem::KBD_ALT) && isMainLoop) {
 					sprintf(saveLoadSlot, "%s.00%d", _targetName.c_str(), event.kbd.keycode - '0');
@@ -599,8 +597,11 @@
 						loadGame(saveLoadSlot);
 					else
 						saveGame(saveLoadSlot, saveLoadSlot);
-				} else if (event.kbd.flags == OSystem::KBD_CTRL && event.kbd.keycode == 'f') {
+				} else if (event.kbd.flags == OSystem::KBD_CTRL) {
+					if (event.kbd.keycode == 'f')
 						_fastMode = !_fastMode;
+					else if (event.kbd.keycode == 'd')
+						_debugger->attach();
 				}
 				break;
 			case OSystem::EVENT_MOUSEMOVE: