--- ray/src/hd/rholo.c 1997/12/12 18:33:50 3.23 +++ ray/src/hd/rholo.c 1997/12/13 10:38:26 3.26 @@ -88,9 +88,6 @@ char *argv[]; default: goto userr; } - /* do we have a job? */ - if (outdev == NULL && ncprocs <= 0) - goto userr; /* get root file name */ rootname(froot, hdkfile=argv[i++]); /* load... */ @@ -133,7 +130,7 @@ char *argv[]; quit(0); userr: fprintf(stderr, -"Usage: %s {-n nprocs|-o disp} [-w][-f] output.hdk [control.hif [VAR=val ..]]\n", +"Usage: %s [-n nprocs][-o disp][-w][-f] output.hdk [control.hif [VAR=val ..]]\n", progname); quit(1); } @@ -233,7 +230,7 @@ initrholo() /* get our holodeck running */ goto memerr; freepacks[--i].nr = 0; freepacks[i].next = NULL; - if (!vbool(OBSTRUCTIONS)) { + if (!vdef(OBSTRUCTIONS) || !vbool(OBSTRUCTIONS)) { freepacks[i].offset = (float *)bmalloc( RPACKSIZ*sizeof(float)*(i+1) ); if (freepacks[i].offset == NULL) @@ -337,10 +334,6 @@ register HDGRID *gp; sprintf(vval(OCTREE), "%s.oct", froot); vdef(OCTREE)++; } - if (!vdef(OBSTRUCTIONS)) { - vval(OBSTRUCTIONS) = "T"; - vdef(OBSTRUCTIONS)++; - } if (!vdef(VDIST)) { vval(VDIST) = "F"; vdef(VDIST)++; @@ -548,10 +541,9 @@ int ec; { int status = 0; - if (hdlist[0] != NULL) { /* flush holodeck */ + if (hdlist[0] != NULL) { /* close holodeck */ if (nprocs > 0) - status = done_rtrace(); - hdflush(NULL); + status = done_rtrace(); /* calls hdsync() */ if (ncprocs > 0 && vdef(REPORT)) { long fsiz, fuse; fsiz = hdfilen(hdlist[0]->fd);