diff options
| author | Stijn Buys <ingar@osirion.org> | 2011-09-04 17:54:51 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2011-09-04 17:54:51 +0000 |
| commit | 69eed715f80c24c2435c82bb9fa1954697bf3af0 (patch) | |
| tree | a21aa14d2ecfa86b94d3b122c2c972d758425782 /src/client/input.cc | |
| parent | edd5dfcd15198f5d5d277835fdf75108eb67472d (diff) | |
Moved main menu infrastructure into client namespace,
removed ui::Container and ui::Menu classes.
Diffstat (limited to 'src/client/input.cc')
| -rw-r--r-- | src/client/input.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/input.cc b/src/client/input.cc index 8672284..69be2ab 100644 --- a/src/client/input.cc +++ b/src/client/input.cc @@ -851,7 +851,7 @@ void frame() mouse_control = false; if (core::application()->connected() && core::localcontrol()) { - mouse_control = ui::console()->hidden() && !ui::root()->active() && ((input_mousecontrol->value() > 0) || (mouse_control_override && (mouse_control_override_time + (input_mousedelay->value() / 1000.0f) < core::application()->time()))); + mouse_control = ui::console()->hidden() && ((input_mousecontrol->value() > 0) || (mouse_control_override && (mouse_control_override_time + (input_mousedelay->value() / 1000.0f) < core::application()->time()))); if (mouse_control && joystick_control && ((render::Camera::mode() == render::Camera::Track) || (render::Camera::mode() == render::Camera::Cockpit))) { if (!(mouse_control_override && (mouse_control_override_time + (input_mousedelay->value() / 1000.0f) < core::application()->time()))) { |