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

fairland: Drop option -o

Browse source 
With -o, fairland doesn't add resources.  This is pretty redundant;
the deity can unset resources with "edit l * i 0 g 0 f 0 c 0 u 0".
Drop the option.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-08-11 13:11:15 +02:00
parent 98e5b4867a
commit 41a2a62273
2 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
man/fairland.6
View file

@ -40,10 +40,6 @@ Help. Print brief usage information and exit.
.B \-i .B \-i
islands will crash into each other and merge islands will crash into each other and merge
.TP .TP
.B \-o
do not set the resources. If you use this flag, then you will need to
set the resources yourself.
.TP
.B \-q .B \-q
run quietly without printing anything to the terminal run quietly without printing anything to the terminal
.TP .TP

17
src/util/fairland.c
View file

@ -109,9 +109,6 @@
#include "version.h" #include "version.h"
#include "xy.h" #include "xy.h"
/* define ORE 1 to add resources, define ORE 0 if you want to use another
program to add the resources */
static int ORE = 1;
static int quiet = 0; static int quiet = 0;
/* If you don't specify these command line arguments, then these are the /* If you don't specify these command line arguments, then these are the
@ -245,7 +242,7 @@ main(int argc, char *argv[])
program_name = argv[0]; program_name = argv[0];
while ((opt = getopt(argc, argv, "e:hioqR:s:v")) != EOF) { while ((opt = getopt(argc, argv, "e:hiqR:s:v")) != EOF) {
switch (opt) { switch (opt) {
case 'e': case 'e':
config_file = optarg; config_file = optarg;
@ -253,9 +250,6 @@ main(int argc, char *argv[])
case 'i': case 'i':
DISTINCT_ISLANDS = 0; DISTINCT_ISLANDS = 0;
break; break;
case 'o':
ORE = 0;
break;
case 'q': case 'q':
quiet = 1; quiet = 1;
break; break;
@ -312,8 +306,7 @@ main(int argc, char *argv[])
qprint("\nelevating land...\n"); qprint("\nelevating land...\n");
create_elevations(); create_elevations();
qprint("designating sectors...\n"); qprint("designating sectors...\n");
if (ORE) qprint("adding resources...\n");
qprint("adding resources...\n");
if (!write_newcap_script()) if (!write_newcap_script())
exit(1); exit(1);
@ -331,8 +324,6 @@ main(int argc, char *argv[])
output(); output();
qprint("\n\nA script for adding all the countries can be found in \"%s\".\n", qprint("\n\nA script for adding all the countries can be found in \"%s\".\n",
outfile); outfile);
if (!ORE)
qprint("\t*** Resources have not been added ***\n");
exit(0); exit(0);
} }
@ -382,7 +373,6 @@ usage(void)
" -e CONFIG-FILE configuration file\n" " -e CONFIG-FILE configuration file\n"
" (default %s)\n" " (default %s)\n"
" -i islands may merge\n" " -i islands may merge\n"
" -o don't set resources\n"
" -q quiet\n" " -q quiet\n"
" -R SEED seed for random number generator\n" " -R SEED seed for random number generator\n"
" -s SCRIPT name of script to create (default %s)\n" " -s SCRIPT name of script to create (default %s)\n"
@ -1142,8 +1132,7 @@ write_sects(void)
sct->sct_elev = total; sct->sct_elev = total;
sct->sct_newtype = sct->sct_type; sct->sct_newtype = sct->sct_type;
sct->sct_dterr = own[sct->sct_x][y] + 1; sct->sct_dterr = own[sct->sct_x][y] + 1;
if (ORE) add_resources(sct);
add_resources(sct);
} }
} }
set_coastal_flags(); set_coastal_flags();