[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.156,1.157

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv4624

Modified Files:
	scummvm.cpp 
Log Message:
fixed #557574 - quickload/save shortcuts where passed on to game engine, which is wrong

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- scummvm.cpp	18 May 2002 20:12:41 -0000	1.156
+++ scummvm.cpp	19 May 2002 12:35:43 -0000	1.157
@@ -1200,16 +1200,13 @@
 		while (_system->poll_event(&event)) {
 			switch(event.event_code) {
 			case OSystem::EVENT_KEYDOWN:
-				_keyPressed = event.kbd.ascii;
-
-				if (event.kbd.keycode >= '0' && event.kbd.keycode<='9') {
-					if (event.kbd.flags == OSystem::KBD_SHIFT ||
-							event.kbd.flags == OSystem::KBD_CTRL) {
-						_saveLoadSlot = event.kbd.keycode - '0';
-						sprintf(_saveLoadName, "Quicksave %d", _saveLoadSlot);
-						_saveLoadFlag = (event.kbd.flags == OSystem::KBD_SHIFT) ? 1 : 2;
-						_saveLoadCompatible = false;
-					} 
+				if (event.kbd.keycode >= '0' && event.kbd.keycode<='9'
+					&& (event.kbd.flags == OSystem::KBD_SHIFT ||
+						event.kbd.flags == OSystem::KBD_CTRL)) {
+					_saveLoadSlot = event.kbd.keycode - '0';
+					sprintf(_saveLoadName, "Quicksave %d", _saveLoadSlot);
+					_saveLoadFlag = (event.kbd.flags == OSystem::KBD_SHIFT) ? 1 : 2;
+					_saveLoadCompatible = false;
 				} else if (event.kbd.flags==OSystem::KBD_CTRL) {
 					if (event.kbd.keycode=='f')
 						_fastMode ^= 1;
@@ -1219,7 +1216,8 @@
 						g_debugger.attach(this);
 					else if (event.kbd.keycode=='s')
 						resourceStats();
-				}
+				} else
+					_keyPressed = event.kbd.ascii;	// Normal key press, pass on to the game.
 				break;
 
 			case OSystem::EVENT_MOUSEMOVE: