--- ray/src/hd/clumpbeams.c 2003/07/21 22:30:18 3.5 +++ ray/src/hd/clumpbeams.c 2003/07/27 22:12:02 3.6 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: clumpbeams.c,v 3.5 2003/07/21 22:30:18 schorsch Exp $"; +static const char RCSid[] = "$Id: clumpbeams.c,v 3.6 2003/07/27 22:12:02 schorsch Exp $"; #endif /* * Bundle holodeck beams together into clumps. @@ -76,7 +76,7 @@ int b; bneighrem = 0; for (i = 9; i--; ) for (j = 9; j--; ) { - if (i == 4 & j == 4) /* don't copy starting beam */ + if ((i == 4) & (j == 4)) /* don't copy starting beam */ continue; if (wg0[i].w == wg1[j].w) continue; @@ -112,7 +112,7 @@ int (*cf)(); bqueue = (int *)malloc(maxcnt*sizeof(int)); bflags = (uint32 *)calloc((nbeams(hp)>>5)+1, sizeof(uint32)); - if (bqueue == NULL | bflags == NULL) + if ((bqueue == NULL) | (bflags == NULL)) error(SYSTEM, "out of memory in clumpbeams"); /* mark empty beams as done */ for (i = nbeams(hp); i > 0; i--)