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>2013-09-15 10:48:44 +0000
committerStijn Buys <ingar@osirion.org>2013-09-15 10:48:44 +0000
commit562d8408a75dffbf92bc59ea1d153fb39eaa626f (patch)
treee9fbad3001572c476604de4ca86216f772b3e87c
parent2ccf933af280efc249b47728b3b3fd6cf1beb90f (diff)
Use HUD pointer color to draw the 'aim' mouse cursor.
-rw-r--r--src/client/hud.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/client/hud.cc b/src/client/hud.cc
index 18b00af..bc75963 100644
--- a/src/client/hud.cc
+++ b/src/client/hud.cc
@@ -400,11 +400,11 @@ void HUD::draw()
if (render::Camera::mode() == render::Camera::Overview) {
- ui::root()->set_pointer("aim");
+ ui::root()->set_pointer("pointer", ui::Palette::Highlight);
} else if (targets::hover()) {
- ui::root()->set_pointer("target", ui::Palette::Active, true);
+ ui::root()->set_pointer("target", ui::Palette::Pointer, true);
if (input::joystick_lastmoved_time() > input::mouse_lastmoved_time()) {
ui::root()->input_mouse(render::State::width() / 2, render::State::height() / 2);
@@ -414,14 +414,13 @@ void HUD::draw()
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)) {
+ } 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);
+ ui::root()->set_pointer("aim", ui::Palette::Pointer);
}
}
}