13 |
|
#include "rhdriver.h" |
14 |
|
|
15 |
|
#ifndef MAXDIST |
16 |
< |
#define MAXDIST 13 /* maximum distance outside section */ |
16 |
> |
#define MAXDIST 42 /* maximum distance outside section */ |
17 |
|
#endif |
18 |
|
|
19 |
|
extern GCOORD *getviewcells(); |
94 |
|
|
95 |
|
if (!cb1->wants) /* put orphans at the end, unsorted */ |
96 |
|
return(cb2->wants); |
97 |
+ |
if (!cb2->wants) |
98 |
+ |
return(-1); |
99 |
|
if ((c = cb1->bi - cb2->bi)) /* sort on beam index first */ |
100 |
|
return(c); |
101 |
|
return(cb1->hd - cb2->hd); /* use hd to resolve matches */ |
486 |
|
VOXL vlnew[8]; |
487 |
|
int n, comn; |
488 |
|
|
489 |
< |
if (!vn->type) { /* clear our beam list */ |
489 |
> |
if (vn == NULL || !vn->type) { /* clear our beam list */ |
490 |
|
set_voxels(vlnew, 0); |
491 |
|
cbeamop(DR_DELSET, cbeam, ncbeams, NULL, 0, 0); |
492 |
|
ncbeams = 0; |
493 |
< |
copystruct(&dvw, vn); |
493 |
> |
dvw.type = 0; |
494 |
|
return(1); |
495 |
|
} |
496 |
|
/* find our new voxels */ |