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>2009-04-19 18:29:26 +0000
committerStijn Buys <ingar@osirion.org>2009-04-19 18:29:26 +0000
commitda36f97e1d764e1125deba86a403eee66e937d0b (patch)
tree8e51fe43780b216920dfeffcb359977a52fe2adc /src/client/targets.cc
parent6ab4021827e91303ac6fe2276f5567810b7e0496 (diff)
added jumpdrive capability to shipmodel info message,
Makefile.am cleanups, improved map targetting, corrected hud target owner color leak bug
Diffstat (limited to 'src/client/targets.cc')
-rw-r--r--src/client/targets.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/client/targets.cc b/src/client/targets.cc
index af8ec17..2350fce 100644
--- a/src/client/targets.cc
+++ b/src/client/targets.cc
@@ -71,11 +71,12 @@ unsigned int hover()
void select_target(core::Entity *entity)
{
current_target = entity;
- if (entity)
+ if (entity) {
current_target_id = current_target->id();
- else
+ audio::play("ui/target");
+ } else {
current_target_id = 0;
- audio::play("ui/target");
+ }
}
void select_target(unsigned int id)
@@ -88,7 +89,7 @@ void select_target(unsigned int id)
core::Entity *entity = zone->find_entity(id);
- if (entity)
+ if (entity && is_valid_hud_target(entity))
select_target(entity);
}