Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-10-21 19:00:39 +0000
committerStijn Buys <ingar@osirion.org>2008-10-21 19:00:39 +0000
commitd79c0223315beaf55fcd10d6891675c4d57b5e2b (patch)
tree3ea902634192dfcffa21a4e7a8cd28da714f0daa /src/client/input.cc
parent9f2e49593639a9f1f3e5f4f7b690ff364afefd56 (diff)
moved client console into libui
Diffstat (limited to 'src/client/input.cc')
-rw-r--r--src/client/input.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/client/input.cc b/src/client/input.cc
index 1e018f5..aa4a954 100644
--- a/src/client/input.cc
+++ b/src/client/input.cc
@@ -8,9 +8,7 @@
#include "audio/audio.h"
#include "auxiliary/functions.h"
-#include "client/chat.h"
#include "client/client.h"
-#include "client/console.h"
#include "client/input.h"
#include "client/joystick.h"
#include "client/keyboard.h"
@@ -485,7 +483,7 @@ void key_pressed(Key *key)
render::Camera::set_direction(0.0f);
render::Camera::set_pitch(0.0f);
- client()->console()->toggle();
+ ui::console()->toggle();
return;
}
@@ -774,7 +772,7 @@ void frame()
mouse_deadzone = false;
if (core::application()->connected() && core::localcontrol()) {
- mouse_control = client()->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() && !ui::root()->active() && ((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()))) {