diff options
| author | Stijn Buys <ingar@osirion.org> | 2008-08-04 22:32:59 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2008-08-04 22:32:59 +0000 |
| commit | 5680cffdd4afdb99d39c644a6c397e670e958848 (patch) | |
| tree | 2ac3d23c49e71731c416b434da37b97b43fa6621 /src/client/keyboard.cc | |
| parent | 50a1e2b2fe3c207c7227df4941f2f66990db0c2c (diff) | |
initial joystick support, added cl_drawkeypress variable
Diffstat (limited to 'src/client/keyboard.cc')
| -rw-r--r-- | src/client/keyboard.cc | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/src/client/keyboard.cc b/src/client/keyboard.cc index 5416580..57d99b3 100644 --- a/src/client/keyboard.cc +++ b/src/client/keyboard.cc @@ -205,13 +205,31 @@ Keyboard::Keyboard() add_key("power", SDLK_POWER); add_key("euro", SDLK_EURO); - // mouse key aliases + // mouse button aliases add_key("mouse1", 512 + SDL_BUTTON_LEFT, 0, "+control"); add_key("mouse2", 512 + SDL_BUTTON_RIGHT); add_key("mouse3", 512 + SDL_BUTTON_MIDDLE); add_key("mouse4", 512 + SDL_BUTTON_WHEELUP, 0, "+thrustup"); add_key("mouse5", 512 + SDL_BUTTON_WHEELDOWN, 0, "+thrustdown"); + + // joystick button aliases + add_key("joy0", 564); + add_key("joy1", 565); + add_key("joy2", 566); + add_key("joy3", 567); + add_key("joy4", 568); + add_key("joy5", 569); + add_key("joy6", 570); + add_key("joy7", 571); + add_key("joy8", 572); + add_key("joy9", 573); + add_key("joy10", 574); + add_key("joy11", 575); + add_key("joy12", 576); + add_key("joy13", 577); + add_key("joy14", 578); + add_key("joy15", 579); } Keyboard::~Keyboard() @@ -375,13 +393,13 @@ void Keyboard::bind(std::string const &name, const std::string str) key->assign(modifier, str.c_str()); if (modifier == Key::None) { - con_print << " " << aux::pad_right(key->name(), 6) << " " << key->bind(Key::None) << std::endl; + con_debug << " " << aux::pad_right(key->name(), 6) << " " << key->bind(Key::None) << std::endl; } else if (modifier == Key::Shift) { - con_print << " shift+" << aux::pad_right(key->name(), 6) << " " << key->bind(Key::Shift) << std::endl; + con_debug << " shift+" << aux::pad_right(key->name(), 6) << " " << key->bind(Key::Shift) << std::endl; } else if (modifier == Key::Ctrl) { - con_print << " ctrl+" << aux::pad_right(key->name(), 6) << " " << key->bind(Key::Ctrl) << std::endl; + con_debug << " ctrl+" << aux::pad_right(key->name(), 6) << " " << key->bind(Key::Ctrl) << std::endl; } else if (modifier == Key::Alt) { - con_print << " alt+" << aux::pad_right(key->name(), 6) << " " << key->bind(Key::Alt) << std::endl; + con_debug << " alt+" << aux::pad_right(key->name(), 6) << " " << key->bind(Key::Alt) << std::endl; } } else { con_print << "Key '" << name << "' not found." << std::endl; |