diff options
Diffstat (limited to 'src/client/input.cc')
-rw-r--r-- | src/client/input.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/client/input.cc b/src/client/input.cc index f40591c..22db6bc 100644 --- a/src/client/input.cc +++ b/src/client/input.cc @@ -221,31 +221,31 @@ void frame(float seconds) mouse_y = event.motion.y; break; case SDL_MOUSEBUTTONDOWN: - if (!console::visible() && core::application()->connected() && core::localcontrol()) + if (!console()->visible() && core::application()->connected() && core::localcontrol()) mousebuttonpressed(event.button); break; case SDL_KEYUP: if (event.key.keysym.sym == SDLK_PRINT) { video::screenshot(); - } else if (!chat::visible() && !console::visible() && + } else if (!chat::visible() && !console()->visible() && core::application()->connected() && core::localcontrol()) // send key events to the game world keyreleased(event.key.keysym); break; case SDL_KEYDOWN: - if (chat::visible() && !console::visible() && (event.key.keysym.sym == SDLK_ESCAPE)) { + if (chat::visible() && !console()->visible() && (event.key.keysym.sym == SDLK_ESCAPE)) { chat::toggle(); } else if (event.key.keysym.sym == '`' || event.key.keysym.sym == '~' || (event.key.keysym.sym == SDLK_ESCAPE)) { //last_control = 0; - console::toggle(); + console()->toggle(); - if (console::visible() && chat::visible()) + if (console()->visible() && chat::visible()) chat::toggle(); - } else if (console::visible()) { + } else if (console()->visible()) { // send key events to the console - console::keypressed(translate_keysym(event.key.keysym)); + console()->keypressed(translate_keysym(event.key.keysym)); } else if (chat::visible()) { if(event.key.keysym.sym == SDLK_ESCAPE) { @@ -270,7 +270,7 @@ void frame(float seconds) } - if (!console::visible() && core::application()->connected() && core::localcontrol()) { + if (!console()->visible() && core::application()->connected() && core::localcontrol()) { if (cl_mousecontrol->value()) { // the mouse will not react if it is in the deadzone @@ -302,8 +302,8 @@ void frame(float seconds) } if ((camera::mode == camera::Track) || (camera::mode == camera::Cockpit)) { - local_direction = mouse_direction; - local_pitch = mouse_pitch; + local_direction = mouse_direction * math::absf(mouse_direction); + local_pitch = mouse_pitch * math::absf(mouse_pitch); } else if (camera::mode == camera::Free) { // squared values to smoothen camera movement camera::set_direction( -mouse_direction * math::absf(mouse_direction)); |