diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-08-28 22:05:34 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-08-28 22:05:34 +0000 |
| commit | 02b546e4c58833721921273e8bf482251cd91a98 (patch) | |
| tree | a7a8b9a00a14171ba29f9cb615c6d9fa51ec37a6 /code/client/cl_keys.c | |
| parent | 6ab5f951ce4b57ab2dd53732fc93d72d7bc085c4 (diff) | |
| download | ioquake3-aero-02b546e4c58833721921273e8bf482251cd91a98.tar.gz ioquake3-aero-02b546e4c58833721921273e8bf482251cd91a98.zip | |
* Revert 'Handle dead keys more gracefully by taking a "best guess" rather than
ignoring completely' from r1459; it can't ever work acceptably, especially on
azerty/qwertz layouts
* Make the ordering of the output from in_keyboardDebug more sensible
* Add cl_consoleKeys cvar, a space delimited list of key names or characters
that toggle the console
git-svn-id: svn://svn.icculus.org/quake3/trunk@1461 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/client/cl_keys.c')
| -rw-r--r-- | code/client/cl_keys.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/code/client/cl_keys.c b/code/client/cl_keys.c index b7fb2fa..fea1b74 100644 --- a/code/client/cl_keys.c +++ b/code/client/cl_keys.c @@ -1172,7 +1172,7 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) { } // console key is hardcoded, so the user can never unbind it - if (key == '`' || key == '~' || + if (key == K_CONSOLE || ( key == K_ESCAPE && keys[K_SHIFT].down ) ) { if (!down) { return; @@ -1315,11 +1315,6 @@ Normal keyboard characters, already shifted / capslocked / etc =================== */ void CL_CharEvent( int key ) { - // the console key should never be used as a char - if ( key == '`' || key == '~' ) { - return; - } - // delete is not a printable character and is // otherwise handled by Field_KeyDownEvent if ( key == 127 ) { |