diff options
| author | Simon Howard | 2006-09-25 20:42:37 +0000 |
|---|---|---|
| committer | Simon Howard | 2006-09-25 20:42:37 +0000 |
| commit | 49474b14d45c37b05e0ab3594c5cc905bcdb14e3 (patch) | |
| tree | 226259d173c32dbeb7e23bfb33e3c3e4f4508184 /src | |
| parent | ce1b828618281c87dd43670ce1a14d71db6a79cb (diff) | |
| download | chocolate-doom-49474b14d45c37b05e0ab3594c5cc905bcdb14e3.tar.gz chocolate-doom-49474b14d45c37b05e0ab3594c5cc905bcdb14e3.tar.bz2 chocolate-doom-49474b14d45c37b05e0ab3594c5cc905bcdb14e3.zip | |
Don't allow function keys to be used in testcontrols mode.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 665
Diffstat (limited to 'src')
| -rw-r--r-- | src/m_menu.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/m_menu.c b/src/m_menu.c index b4e73d64..e7c7f63f 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: m_menu.c 662 2006-09-25 18:04:29Z fraggle $ +// $Id: m_menu.c 665 2006-09-25 20:42:37Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -78,7 +78,7 @@ //----------------------------------------------------------------------------- static const char -rcsid[] = "$Id: m_menu.c 662 2006-09-25 18:04:29Z fraggle $"; +rcsid[] = "$Id: m_menu.c 665 2006-09-25 20:42:37Z fraggle $"; #include <stdlib.h> #include <ctype.h> @@ -1550,9 +1550,18 @@ boolean M_Responder (event_t* ev) if (ch == -1) return false; - if (testcontrols && ch == KEY_ESCAPE) + // In testcontrols mode, none of the function keys should do anything + // - the only key is escape to quit. + + if (testcontrols) { - I_Quit(); + if (ch == KEY_ESCAPE) + { + I_Quit(); + return true; + } + + return false; } // Save Game string input |