[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.59,1.60

Max Horn fingolfin at users.sourceforge.net
Sun Jun 15 04:33:06 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv14624/backends/sdl

Modified Files:
	sdl-common.cpp 
Log Message:
fixed 'quit' entry in help for Mac OS X; disabled Alt-X/Ctrl-Z on OS X (Cmd-Q is the one and only true way to quit here :-)

Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- sdl-common.cpp	9 Jun 2003 01:19:25 -0000	1.59
+++ sdl-common.cpp	15 Jun 2003 11:32:14 -0000	1.60
@@ -543,19 +543,20 @@
 				break;
 			}
 
-			// Ctrl-z and Alt-X quit
-			if ((b == KBD_CTRL && ev.key.keysym.sym=='z') || (b == KBD_ALT && ev.key.keysym.sym=='x')) {
-				event->event_code = EVENT_QUIT;
-				return true;
-			}
-
 #ifdef MACOSX
 			// On Macintosh', Cmd-Q quits
 			if ((ev.key.keysym.mod & KMOD_META) && ev.key.keysym.sym=='q') {
 				event->event_code = EVENT_QUIT;
 				return true;
 			}
+#else
+			// Ctrl-z and Alt-X quit
+			if ((b == KBD_CTRL && ev.key.keysym.sym=='z') || (b == KBD_ALT && ev.key.keysym.sym=='x')) {
+				event->event_code = EVENT_QUIT;
+				return true;
+			}
 #endif
+
 			// Ctr-Alt-<key> will change the GFX mode
 			if (b == (KBD_CTRL|KBD_ALT)) {
 				char keys[] = "1234567890";





More information about the Scummvm-git-logs mailing list