diff options
Diffstat (limited to 'src/client/map.cc')
| -rw-r--r-- | src/client/map.cc | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/client/map.cc b/src/client/map.cc index 805957c..a2a353a 100644 --- a/src/client/map.cc +++ b/src/client/map.cc @@ -18,21 +18,6 @@ namespace client { -bool is_valid_map_target(core::Entity *entity) -{ - if (entity->serverside()) { - return false; - } else if (entity == core::localcontrol()) { - return false; - } else if (entity->flag_is_set(core::Entity::ShowOnMap)) { - return true; - } else if (entity == core::localplayer()->mission_target()) { - return true; - } else { - return false; - } -} - Map::Map(ui::Widget *parent) : ui::Window(parent) { set_label("map"); @@ -141,7 +126,7 @@ void Map::draw() bool draw_icon = false; l.assign(v); - if (is_valid_map_target(entity)) { + if (targets::is_valid_map_target(entity)) { draw_icon = true; l.x -= s / scale * entity->location().y; l.y -= s / scale * entity->location().x; @@ -253,9 +238,10 @@ bool Map::on_keypress(const int key, const unsigned int modifier) if (key == 512 + SDL_BUTTON_LEFT) { if (hover()) { core::Entity *target = core::localplayer()->zone()->find_entity(hover()); - if (is_valid_map_target(target)) { + if (targets::is_valid_map_target(target)) { map_target = target; - audio::play("ui/target"); + targets::select_target(map_target); + //audio::play("ui/target"); } } return true; |