diff options
| author | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2005-09-04 12:14:54 +0200 |
|---|---|---|
| committer | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2005-09-04 12:14:54 +0200 |
| commit | 6dce9b9515265d938a672a0817fd293015c77551 (patch) | |
| tree | 999fa51735a22abf8da35e71c12e15882936b2bb /src/Panorama.cxx | |
| parent | 700f8cb97bc9a033b82252e0120e41962135fb06 (diff) | |
Make Hill flags part of Hill class
Diffstat (limited to 'src/Panorama.cxx')
| -rw-r--r-- | src/Panorama.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Panorama.cxx b/src/Panorama.cxx index b72e37b..cb98105 100644 --- a/src/Panorama.cxx +++ b/src/Panorama.cxx @@ -81,7 +81,7 @@ Panorama::remove_trackpoints() { for(int i=0; i<mountains->get_num(); i++) { m = mountains->get(i); - if (! (m->flags & HILL_TRACK_POINT)) { + if (! (m->flags & Hill::TRACK_POINT)) { h_new->add(m); } } @@ -194,7 +194,7 @@ Panorama::guess(Hills *p, Hill *m1) { m1->x = x1_sav; m1->y = y1_sav; - if (m_tmp2->flags & HILL_TRACK_POINT || + if (m_tmp2->flags & Hill::TRACK_POINT || m1 == m_tmp2 || fabs(m1->alph - m_tmp2->alph) > pi_d *0.7) { continue; } @@ -411,7 +411,7 @@ Panorama::update_close_mountains() { for (i=0; i<mountains->get_num(); i++) { m = mountains->get(i); - if (m->flags & HILL_TRACK_POINT || + if (m->flags & Hill::TRACK_POINT || ((m->phi != view_phi || m->lam != view_lam) && (m->height / (m->dist * EARTH_RADIUS) > height_dist_ratio))) { @@ -443,9 +443,9 @@ Panorama::update_visible_mountains() { if (m->a_view < view_angle && m->a_view > - view_angle) { visible_mountains->add(m); - m->flags |= HILL_VISIBLE; + m->flags |= Hill::VISIBLE; } else { - m->flags &= ~HILL_VISIBLE; + m->flags &= ~Hill::VISIBLE; } } |