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-12-20 14:52:10 +0000
committerStijn Buys <ingar@osirion.org>2008-12-20 14:52:10 +0000
commit62e480c2d887aae67add7ee7aed68463be897811 (patch)
tree6021c5d45e83d1bb858d2f0b3fcfff6490a79d78 /src/client/view.cc
parent11229dcfef77baab5a7a3893a7c6281fbc5f7211 (diff)
map targetting
Diffstat (limited to 'src/client/view.cc')
-rw-r--r--src/client/view.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/client/view.cc b/src/client/view.cc
index e7704f2..1c35708 100644
--- a/src/client/view.cc
+++ b/src/client/view.cc
@@ -273,8 +273,10 @@ void View::draw()
}
} else {
view_notify->set_visible(false);
-
view_chat->set_visible(false);
+ }
+
+ if (!core::localcontrol()) {
view_map->set_visible(false);
}
@@ -703,6 +705,10 @@ void set_cursor()
ui::root()->set_pointer();
+ } else if (client()->view()->map()->hover()) {
+
+ ui::root()->set_pointer("pointer");
+
} else if (render::Camera::mode() == render::Camera::Overview) {
ui::root()->set_pointer("aim");
@@ -748,7 +754,7 @@ void frame(float elapsed)
render::Camera::frustum();
render::draw(elapsed); // draw the world
- targets::draw(); // validate current target, render sound
+ targets::frame(); // validate current target, render sound
if (!core::localplayer()->view() && targets::current()) // draw target docks etc
draw_entity_world_target(targets::current());