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>2011-07-31 18:23:09 +0000
committerStijn Buys <ingar@osirion.org>2011-07-31 18:23:09 +0000
commitf0cbe1d0655013d14dd4f1807ddb88789ae8d27a (patch)
treed21a926978e38b70c96bd80dfed28b7aa9396d53 /src/client/hud.cc
parent5a464fca4618af9eeb0fe3f2c43d148fb194a015 (diff)
Handle local mouse pointer in client::HUD,
removed video::set_cursor() method.
Diffstat (limited to 'src/client/hud.cc')
-rw-r--r--src/client/hud.cc29
1 files changed, 29 insertions, 0 deletions
diff --git a/src/client/hud.cc b/src/client/hud.cc
index d712987..423bf58 100644
--- a/src/client/hud.cc
+++ b/src/client/hud.cc
@@ -393,6 +393,35 @@ void HUD::draw()
gl::disable(GL_TEXTURE_2D);
+
+ if (has_mouse_focus()) {
+
+ if (render::Camera::mode() == render::Camera::Overview) {
+
+ ui::root()->set_pointer("aim");
+
+ } else if (targets::hover()) {
+
+ ui::root()->set_pointer("target", ui::Palette::Active, true);
+
+ if (input::joystick_lastmoved_time() > input::mouse_lastmoved_time()) {
+ ui::root()->input_mouse(render::State::width() / 2, render::State::height() / 2);
+ }
+
+ } else if (input::mouse_control) {
+
+ ui::root()->set_pointer("control", ui::Palette::Pointer);
+
+ } else if ((input::joystick_lastmoved_time() > input::mouse_lastmoved_time()) &&
+ (render::Camera::mode() == render::Camera::Cockpit || render::Camera::mode() == render::Camera::Track)) {
+
+ ui::root()->set_pointer();
+
+ } else {
+
+ ui::root()->set_pointer("aim", ui::Palette::Foreground);
+ }
+ }
}
}