empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(main, usage): New option -v.

Browse source 
(usage): Improve usage message.
This commit is contained in:
Markus Armbruster 2006-01-27 18:00:47 +00:00
parent 5109a30910
commit 68a7ae71b0
1 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/util/fairland.c
View file

@ -83,6 +83,7 @@ static int quiet = 0;
#include "xy.h" #include "xy.h"
#include "optlist.h" #include "optlist.h"
#include "prototypes.h" #include "prototypes.h"
#include "version.h"
/* do not change these 4 defines */ /* do not change these 4 defines */
#define LANDMIN 1 /* plate altitude for normal land */ #define LANDMIN 1 /* plate altitude for normal land */
@ -197,32 +198,35 @@ main(int argc, char *argv[])
program_name = argv[0]; program_name = argv[0];
rnd_seed = time(NULL); rnd_seed = time(NULL);
while ((opt = getopt(argc, argv, "ae:hioqs:R:")) != EOF) { while ((opt = getopt(argc, argv, "ae:hioqR:s:v")) != EOF) {
switch (opt) { switch (opt) {
case 'a': case 'a':
AIRPORT_MARKER = 1; AIRPORT_MARKER = 1;
break; break;
case 'i':
DISTINCT_ISLANDS = 0;
break;
case 'e': case 'e':
config_file = optarg; config_file = optarg;
break; break;
case 'i':
DISTINCT_ISLANDS = 0;
break;
case 'o': case 'o':
ORE = 0; ORE = 0;
break; break;
case 'q': case 'q':
quiet = 1; quiet = 1;
break; break;
case 's':
outfile = optarg;
break;
case 'R': case 'R':
rnd_seed = strtoul(optarg, NULL, 10); rnd_seed = strtoul(optarg, NULL, 10);
break; break;
case 's':
outfile = optarg;
break;
case 'h': case 'h':
usage(); usage();
return 0; exit(0);
case 'v':
printf("%s\n\n%s", version, legal);
exit(0);
default: default:
help(NULL); help(NULL);
exit(1); exit(1);
@ -314,24 +318,25 @@ help(char *complaint)
static void static void
usage(void) usage(void)
{ {
printf("Usage: %s [-e CONFIG] [-aiqo] [-s SCRIPT] [-R SEED] NC SC [NI] [IS] [SP] [PM] [DI] [ID]\n" printf("Usage: %s [OPTION]... NC SC [NI] [IS] [SP] [PM] [DI] [ID]\n"
" -q quiet\n" " -a airport marker for continents\n"
" -o don't set resources\n" " -e CONFIG-FILE configuration file\n"
" -a airport marker for continents\n" " (default %s)\n"
" -i islands may merge\n" " -h display this help and exit\n"
" -R SEED seed for random number generator\n" " -i islands may merge\n"
" -e CONFIG configuration file\n" " -o don't set resources\n"
" -s SCRIPT name of script to create (default %s)\n" " -q quiet\n"
" NC number of continents\n" " -R SEED seed for random number generator\n"
" SC continent size\n" " -s SCRIPT name of script to create (default %s)\n"
" NI number of islands (default NC)\n" " NC number of continents\n"
" IS average island size (default SC/2)\n" " SC continent size\n"
" SP spike percentage: 0 = round, 100 = snake\n" " NI number of islands (default NC)\n"
" (default = %d)\n" " IS average island size (default SC/2)\n"
" PM percentage of land that is mountain (default %d)\n" " SP spike percentage: 0 = round, 100 = snake (default %d)\n"
" DI minimum distance between continents (default %d)\n" " PM percentage of land that is mountain (default %d)\n"
" ID minimum distance from islands to continents (default %d)\n", " DI minimum distance between continents (default %d)\n"
program_name, DEFAULT_OUTFILE_NAME, " ID minimum distance from islands to continents (default %d)\n",
program_name, dflt_econfig, DEFAULT_OUTFILE_NAME,
DEFAULT_SPIKE, DEFAULT_MOUNTAIN, DEFAULT_CONTDIST, DEFAULT_ISLDIST); DEFAULT_SPIKE, DEFAULT_MOUNTAIN, DEFAULT_CONTDIST, DEFAULT_ISLDIST);
} }