diff options
| author | Stijn Buys <ingar@osirion.org> | 2015-01-06 19:16:58 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2015-01-06 19:16:58 +0000 |
| commit | da18502a892f7ab025972c51fe268ef7e5e9a18b (patch) | |
| tree | bb7be01bd5d66fbcf3400b3ef361de243147426f /src/client/keyboard.cc | |
| parent | 72ee43e9470c6fdbc6ed7ff92b85dfa5062c5762 (diff) | |
SDL2 support in previous commit,
corrected a segfault when pressing a key with an unknown scancode,
renamed camera related actions to +lookleft +lookright +lookup +lookdown,
bind +freelook to left shift by default.
Diffstat (limited to 'src/client/keyboard.cc')
| -rw-r--r-- | src/client/keyboard.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/client/keyboard.cc b/src/client/keyboard.cc index e21fc91..bb3b20d 100644 --- a/src/client/keyboard.cc +++ b/src/client/keyboard.cc @@ -38,10 +38,10 @@ Keyboard::Keyboard() add_action("+rollleft", Action::RollLeft, "roll left"); add_action("+rollright", Action::RollRight, "roll right"); - add_action("+camleft", Action::CamLeft, "rotate camera left"); - add_action("+camright", Action::CamRight, "rotate camera right"); - add_action("+camup", Action::CamUp, "rotate camera up"); - add_action("+camdown", Action::CamDown, "rotate camera down"); + add_action("+lookleft", Action::LookLeft, "look left"); + add_action("+lookright", Action::LookRight, "look right"); + add_action("+lookup", Action::LookUp, "look up"); + add_action("+lookdown", Action::LookDown, "look down"); add_action("+zoomin", Action::ZoomIn, "zoom camera in"); add_action("+zoomout", Action::ZoomOut, "zoom camera out"); @@ -151,6 +151,7 @@ Keyboard::Keyboard() add_key(SDL_SCANCODE_KP_PLUS, "kpplus", '+', "+thrustup"); add_key(SDL_SCANCODE_KP_ENTER, "kpenter", '\n', "ui_chat"); add_key(SDL_SCANCODE_KP_EQUALS, "kpequal", '='); + add_key(SDL_SCANCODE_KP_LESS, "kpless", '<'); add_key(SDL_SCANCODE_UP, "up", 0, "+camup"); add_key(SDL_SCANCODE_DOWN, "down", 0, "+camdown"); @@ -187,7 +188,7 @@ Keyboard::Keyboard() add_key(SDL_SCANCODE_SCROLLLOCK, "scrollock"); add_key(SDL_SCANCODE_RSHIFT, "rshift"); - add_key(SDL_SCANCODE_LSHIFT, "lshift"); + add_key(SDL_SCANCODE_LSHIFT, "lshift", 0, "+freelook"); add_key(SDL_SCANCODE_RCTRL, "rctrl"); add_key(SDL_SCANCODE_LCTRL, "lctrl"); |