90 |
|
} |
91 |
|
/* get root file name */ |
92 |
|
rootname(froot, hdkfile=argv[i++]); |
93 |
< |
/* load... */ |
94 |
< |
if (i < argc) { /* variables */ |
95 |
< |
loadvars(argv[i++]); |
96 |
< |
/* cmdline settings */ |
97 |
< |
for ( ; i < argc; i++) |
98 |
< |
if (setvariable(argv[i], matchvar) < 0) { |
99 |
< |
sprintf(errmsg, "unknown variable: %s", |
100 |
< |
argv[i]); |
101 |
< |
error(USER, errmsg); |
102 |
< |
} |
103 |
< |
/* check settings */ |
104 |
< |
checkvalues(); |
105 |
< |
/* load RIF if any */ |
106 |
< |
getradfile(); |
93 |
> |
/* load variables? */ |
94 |
> |
if (i < argc) |
95 |
> |
if (argv[i][0] != '-' && argv[i][0] != '+') |
96 |
> |
loadvars(argv[i]); /* load variables from file */ |
97 |
> |
|
98 |
> |
if (i >= argc || argv[i][0] == '+') |
99 |
> |
loadholo(); /* load existing holodeck */ |
100 |
> |
|
101 |
> |
while (++i < argc) /* get command line settings */ |
102 |
> |
if (setvariable(argv[i], matchvar) < 0) { |
103 |
> |
sprintf(errmsg, "unknown variable: %s", argv[i]); |
104 |
> |
error(USER, errmsg); |
105 |
> |
} |
106 |
> |
/* check settings */ |
107 |
> |
checkvalues(); |
108 |
> |
/* load RIF if any */ |
109 |
> |
getradfile(); |
110 |
> |
|
111 |
> |
if (hdlist[i] == NULL) { /* create new holodeck */ |
112 |
|
/* set defaults */ |
113 |
|
setdefaults(&hdg); |
114 |
|
/* holodeck exists? */ |
117 |
|
"holodeck file exists -- use -f to overwrite"); |
118 |
|
/* create holodeck */ |
119 |
|
creatholo(&hdg); |
120 |
< |
} else { /* else load holodeck */ |
116 |
< |
loadholo(); |
117 |
< |
/* check settings */ |
118 |
< |
checkvalues(); |
119 |
< |
/* load RIF if any */ |
120 |
< |
getradfile(); |
121 |
< |
/* set defaults */ |
120 |
> |
} else /* else just set defaults */ |
121 |
|
setdefaults(NULL); |
123 |
– |
} |
122 |
|
/* initialize */ |
123 |
|
initrholo(); |
124 |
|
/* main loop */ |
128 |
|
quit(0); |
129 |
|
userr: |
130 |
|
fprintf(stderr, |
131 |
< |
"Usage: %s [-n nprocs][-o disp][-w][-f] output.hdk [control.hif [VAR=val ..]]\n", |
131 |
> |
"Usage: %s [-n nprocs][-o disp][-w][-f] output.hdk [control.hif|+|- [VAR=val ..]]\n", |
132 |
|
progname); |
133 |
|
quit(1); |
134 |
|
} |