summaryrefslogtreecommitdiff
path: root/src/Hill.cxx
diff options
context:
space:
mode:
authorJohannes Hofmann <Johannes.Hofmann@gmx.de>2005-07-30 16:59:09 +0100
committerJohannes Hofmann <Johannes.Hofmann@gmx.de>2005-07-30 16:59:09 +0100
commit306a3865d4874417df3ce35e5a1792d194a0a1c6 (patch)
tree69d737675fafd18a8ba610e232911ddecc9bd816 /src/Hill.cxx
parent02a0aca8283e7acd62eb4223c41a671209e5bf7d (diff)
initial track support
Diffstat (limited to 'src/Hill.cxx')
-rw-r--r--src/Hill.cxx10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Hill.cxx b/src/Hill.cxx
index d189bd7..35c7ada 100644
--- a/src/Hill.cxx
+++ b/src/Hill.cxx
@@ -38,7 +38,7 @@ Hill::Hill(const char *n, double p, double l, double h) {
alph = 0.0;
x = 0;
y = 0;
- duplicate = 0;
+ flags = 0;
}
Hill::Hill(int x_tmp, int y_tmp) {
@@ -131,7 +131,7 @@ void Hills::mark_duplicates(double dist) {
while (n && fabs(n->phi - m->phi) <= dist) {
if (fabs(n->lam - m->lam) <= dist &&
fabs(n->height - m->height) <= 50.0 ) {
- n->duplicate = 1;
+ n->flags |= HILL_DUPLICATE;
}
j = j + 1;
n = get(j);
@@ -158,6 +158,12 @@ Hills::add(Hill *m1) {
m[num++] = m1;
}
+void
+Hills::add(Hills *h) {
+ for(int i=0; i<h->get_num(); i++) {
+ add(h->get(i));
+ }
+}
static int
comp_mountains(const void *n1, const void *n2) {