diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-20 17:47:42 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-20 17:47:42 +0000 |
| commit | 8404143afe48c04e0c84a9bbde08ebf400b7f7fb (patch) | |
| tree | 555522478fb9ea05bbd4a9dd65c5124874252f13 /src/game/client | |
| parent | 2b9688f3c3085e4fb07906a71bbedb8a6b916a59 (diff) | |
| download | zcatch-8404143afe48c04e0c84a9bbde08ebf400b7f7fb.tar.gz zcatch-8404143afe48c04e0c84a9bbde08ebf400b7f7fb.zip | |
added SDL support
Diffstat (limited to 'src/game/client')
| -rw-r--r-- | src/game/client/components/binds.cpp | 14 | ||||
| -rw-r--r-- | src/game/client/components/console.cpp | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/game/client/components/binds.cpp b/src/game/client/components/binds.cpp index b55e7333..de5f4f05 100644 --- a/src/game/client/components/binds.cpp +++ b/src/game/client/components/binds.cpp @@ -6,7 +6,7 @@ bool BINDS::BINDS_SPECIAL::on_input(INPUT_EVENT e) { // don't handle invalid events and keys that arn't set to anything - if(e.key >= KEY_F1 && e.key <= KEY_F25 && binds->keybindings[e.key][0] != 0) + if(e.key >= KEY_F1 && e.key <= KEY_F15 && binds->keybindings[e.key][0] != 0) { int stroke = 0; if(e.flags&INPFLAG_PRESS) @@ -86,9 +86,14 @@ void BINDS::set_defaults() bind(KEY_F2, "toggle_remote_console"); bind(KEY_TAB, "+scoreboard"); bind(KEY_F10, "screenshot"); - + +#ifdef CONFIG_NO_SDL bind('A', "+left"); bind('D', "+right"); +#else + bind('a', "+left"); + bind('d', "+right"); +#endif bind(KEY_SPACE, "+jump"); bind(KEY_MOUSE_1, "+fire"); bind(KEY_MOUSE_2, "+hook"); @@ -103,8 +108,13 @@ void BINDS::set_defaults() bind(KEY_MOUSE_WHEEL_UP, "+prevweapon"); bind(KEY_MOUSE_WHEEL_DOWN, "+nextweapon"); +#ifdef CONFIG_NO_SDL bind('T', "chat all"); bind('Y', "chat team"); +#else + bind('t', "chat all"); + bind('y', "chat team"); +#endif bind(KEY_F3, "vote yes"); bind(KEY_F4, "vote no"); diff --git a/src/game/client/components/console.cpp b/src/game/client/components/console.cpp index c8fe018e..71653fdf 100644 --- a/src/game/client/components/console.cpp +++ b/src/game/client/components/console.cpp @@ -295,7 +295,7 @@ bool CONSOLE::on_input(INPUT_EVENT e) { if(console_state == CONSOLE_CLOSED) return false; - if(e.key >= KEY_F1 && e.key <= KEY_F25) + if(e.key >= KEY_F1 && e.key <= KEY_F15) return false; if(e.key == KEY_ESC && (e.flags&INPFLAG_PRESS)) |