thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 :-)

Browse source 
svn-id: r8505
This commit is contained in:
Max Horn 2003-06-15 11:32:14 +00:00
parent 8446d7d67e
commit b8b80805c1
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backends/sdl/sdl-common.cpp
View file

@ -543,19 +543,20 @@ bool OSystem_SDL_Common::poll_event(Event *event) {
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";

4
scumm/help.cpp
View file

@ -73,7 +73,11 @@ void ScummHelp::updateStrings(byte gameId, int page, String &title,
ADD_BIND("Space", "Pause game");
ADD_BIND("Ctrl 0-9", "Load game state 1-10");
ADD_BIND("Alt 0-9", "Save game state 1-10");
#ifdef MACOSX
ADD_BIND("Alt x, Ctrl z", "Quit");
#else
ADD_BIND("Cmd q", "Quit");
#endif
ADD_BIND("Alt Enter", "Toggle fullscreen");
ADD_BIND("[, ]", "Music volume up / down");
ADD_BIND("-, +", "Text speed slower / faster");