214 |
|
/* |
215 |
|
* Ambient level test. |
216 |
|
*/ |
217 |
< |
if (av->lvl > al || av->weight < r->rweight-FTINY) |
217 |
> |
if (av->lvl > al) /* list sorted, so this works */ |
218 |
> |
break; |
219 |
> |
if (av->weight < r->rweight-FTINY) |
220 |
|
continue; |
221 |
|
/* |
222 |
|
* Ambient radius test. |
403 |
|
register AMBVAL *av; |
404 |
|
{ |
405 |
|
register AMBTREE *at; |
406 |
+ |
register AMBVAL *ap; |
407 |
+ |
AMBVAL avh; |
408 |
|
FVECT ck0; |
409 |
|
double s; |
410 |
|
int branch; |
428 |
|
} |
429 |
|
at = at->kid + branch; |
430 |
|
} |
431 |
< |
av->next = at->alist; |
432 |
< |
at->alist = av; |
431 |
> |
avh.next = at->alist; /* order by increasing level */ |
432 |
> |
for (ap = &avh; ap->next != NULL; ap = ap->next) |
433 |
> |
if (ap->next->lvl >= av->lvl) |
434 |
> |
break; |
435 |
> |
av->next = ap->next; |
436 |
> |
ap->next = av; |
437 |
> |
at->alist = avh.next; |
438 |
|
} |
439 |
|
|
440 |
|
|
502 |
|
avinsert(avstore(&avs)); |
503 |
|
n -= AMBVALSIZ; |
504 |
|
} |
505 |
< |
if (n) /* alignment */ |
505 |
> |
/*** seek always as safety measure |
506 |
> |
if (n) ***/ /* alignment */ |
507 |
|
if (lseek(fileno(ambfp), flen-n, 0) < 0) |
508 |
|
goto seekerr; |
509 |
|
} |