From da18502a892f7ab025972c51fe268ef7e5e9a18b Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 6 Jan 2015 19:16:58 +0000 Subject: 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. --- src/client/input.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/client/input.cc') diff --git a/src/client/input.cc b/src/client/input.cc index cf0c986..9b2521e 100644 --- a/src/client/input.cc +++ b/src/client/input.cc @@ -411,7 +411,7 @@ void action_press(Key *key) /* -- camera control ------------------------------ */ - case Action::CamLeft: + case Action::LookLeft: if (render::Camera::mode() == render::Camera::Free) { render::Camera::set_direction(math::min(key->pressed() - core::application()->time(), 1.0f)); @@ -419,7 +419,7 @@ void action_press(Key *key) render::Camera::set_direction(-math::min(key->pressed() - core::application()->time(), 1.0f)); } break; - case Action::CamRight: + case Action::LookRight: if (render::Camera::mode() == render::Camera::Free) { render::Camera::set_direction(-math::min(key->pressed() - core::application()->time(), 1.0f)); @@ -427,7 +427,7 @@ void action_press(Key *key) render::Camera::set_direction(math::min(key->pressed() - core::application()->time(), 1.0f)); } break; - case Action::CamUp: + case Action::LookUp: if (render::Camera::mode() == render::Camera::Free) { render::Camera::set_pitch(math::min(key->pressed() - core::application()->time(), 1.0f)); @@ -435,7 +435,7 @@ void action_press(Key *key) render::Camera::set_pitch(-math::min(key->pressed() - core::application()->time(), 1.0f)); } break; - case Action::CamDown: + case Action::LookDown: if (render::Camera::mode() == render::Camera::Free) { render::Camera::set_pitch(-math::min(key->pressed() - core::application()->time(), 1.0f)); @@ -546,16 +546,16 @@ void action_release(Key *key) /* -- camera control ------------------------------ */ - case Action::CamLeft: + case Action::LookLeft: render::Camera::set_direction(0.0f); break; - case Action::CamRight: + case Action::LookRight: render::Camera::set_direction(0.0f); break; - case Action::CamUp: + case Action::LookUp: render::Camera::set_pitch(0.0f); break; - case Action::CamDown: + case Action::LookDown: render::Camera::set_pitch(0.0f); break; case Action::ZoomIn: @@ -804,7 +804,7 @@ void frame() case SDL_MOUSEBUTTONDOWN: key = keyboard->press(512 + event.button.button); pressed = true; - if (key && (console_key_pressed(key) || ui::root()->input_mouse_button(true, event.button.button))) + if ((key && console_key_pressed(key)) || ui::root()->input_mouse_button(true, event.button.button)) { key = 0; } @@ -865,7 +865,7 @@ void frame() keyboard_modifiers = event.key.keysym.mod; key = keyboard->press(event.key.keysym.scancode); pressed = true; - if (console_key_pressed(key) || ui::root()->input_key(true, Keyboard::translate_keysym(event.key.keysym.sym, keyboard_modifiers), keyboard_modifiers)) + if ((key && console_key_pressed(key)) || ui::root()->input_key(true, Keyboard::translate_keysym(event.key.keysym.sym, keyboard_modifiers), keyboard_modifiers)) { key = 0; } -- cgit v1.2.3