diff options
author | Stijn Buys <ingar@osirion.org> | 2008-12-26 12:21:48 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-12-26 12:21:48 +0000 |
commit | b875124824794a7762414db76ed9f953b8ba320f (patch) | |
tree | 86f27d64e4a9e91a93cb4b30752f27eeec6526ac /src/client/view.cc | |
parent | bfa10f9990a8a045b03474d11af75984c12a856a (diff) |
default player settings in player.ini,
palette text colors,
cleanups
Diffstat (limited to 'src/client/view.cc')
-rw-r--r-- | src/client/view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/view.cc b/src/client/view.cc index 1c35708..1c1b108 100644 --- a/src/client/view.cc +++ b/src/client/view.cc @@ -418,7 +418,7 @@ void draw_entity_offscreen_target(core::Entity *entity, bool is_active_target) gl::end(); if (entity == core::localplayer()->mission_target()) { - gl::color(1, 0.5f, 1, 1); // FIXME mission color + gl::color(ui::root()->palette()->mission()); } else if (entity->type() == core::Entity::Controlable) { gl::color(0, 1, 0, 1); // FIXME allegiance color } else { @@ -488,7 +488,7 @@ void draw_entity_target(core::Entity *entity, bool is_active_target) } if (entity == core::localplayer()->mission_target()) { - gl::color(1, 0.5f, 1, 1); // FIXME mission color + gl::color(ui::root()->palette()->mission()); } else if (entity->type() == core::Entity::Controlable) { gl::color(0, 1, 0, 1); // FIXME allegiance color } else { |