--- ray/src/hd/rholo.c	1997/12/12 19:52:31	3.24
+++ ray/src/hd/rholo.c	1997/12/15 20:43:01	3.28
@@ -88,25 +88,27 @@ 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... */
-	if (i < argc) {				/* variables */
-		loadvars(argv[i++]);
-							/* cmdline settings */
-		for ( ; i < argc; i++)
-			if (setvariable(argv[i], matchvar) < 0) {
-				sprintf(errmsg, "unknown variable: %s",
-						argv[i]);
-				error(USER, errmsg);
-			}
-							/* check settings */
-		checkvalues();
-							/* load RIF if any */
-		getradfile();
+						/* load variables? */
+	if (i < argc)
+		if (argv[i][0] != '-' && argv[i][0] != '+')
+			loadvars(argv[i]);	/* load variables from file */
+
+	if (i >= argc || argv[i][0] == '+')
+		loadholo();			/* load existing holodeck */
+
+	while (++i < argc)			/* get command line settings */
+		if (setvariable(argv[i], matchvar) < 0) {
+			sprintf(errmsg, "unknown variable: %s", argv[i]);
+			error(USER, errmsg);
+		}
+						/* check settings */
+	checkvalues();
+						/* load RIF if any */
+	getradfile();
+
+	if (hdlist[0] == NULL) {		/* create new holodeck */
 							/* set defaults */
 		setdefaults(&hdg);
 							/* holodeck exists? */
@@ -115,15 +117,8 @@ char	*argv[];
 				"holodeck file exists -- use -f to overwrite");
 							/* create holodeck */
 		creatholo(&hdg);
-	} else {				/* else load holodeck */
-		loadholo();
-							/* check settings */
-		checkvalues();
-							/* load RIF if any */
-		getradfile();
-							/* set defaults */
+	} else					/* else just set defaults */
 		setdefaults(NULL);
-	}
 						/* initialize */
 	initrholo();
 						/* main loop */
@@ -133,7 +128,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);
 }
@@ -147,7 +142,7 @@ int  signo;
 	if (gotsig++)			/* two signals and we're gone! */
 		_exit(signo);
 
-	alarm(30);			/* allow 30 seconds to clean up */
+	alarm(60);			/* allow 60 seconds to clean up */
 	signal(SIGALRM, SIG_DFL);	/* make certain we do die */
 	eputs("signal - ");
 	eputs(sigerr[signo]);
@@ -233,7 +228,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)
@@ -277,13 +272,14 @@ rholo()				/* holodeck main loop */
 		if (!disp_check(idle))
 			return(0);
 					/* display only? */
-	if (nprocs <= 0)
+	if (nprocs <= 0) {
+		idle = 1;
 		return(outdev != NULL);
+	}
 					/* check file size */
 	if (maxdisk > 0 && hdfilen(hdlist[0]->fd) >= maxdisk) {
 		error(WARNING, "file limit exceeded");
 		done_rtrace();
-		idle = 1;
 		return(1);	/* comes back */
 	}
 					/* check time */
@@ -292,12 +288,11 @@ rholo()				/* holodeck main loop */
 	if (endtime > 0 && t >= endtime) {
 		error(WARNING, "time limit exceeded");
 		done_rtrace();
-		idle = 1;
 		return(1);	/* comes back */
 	}
 	if (reporttime > 0 && t >= reporttime)
 		report(t);
-					/* get packets to process */
+	idle = 0;			/* get packets to process */
 	while (freepacks != NULL) {
 		p = freepacks; freepacks = p->next; p->next = NULL;
 		if (!next_packet(p)) {
@@ -337,17 +332,9 @@ 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)++;
-	}
-	if (!vdef(OCCUPANCY)) {
-		vval(OCCUPANCY) = "U";
-		vdef(OCCUPANCY)++;
 	}
 				/* append rendering options */
 	if (vdef(RENDER))