Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/input.cc')
-rw-r--r--src/client/input.cc20
1 files changed, 10 insertions, 10 deletions
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;
}