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

fairland: Collect command line global variables in one place

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-08-02 08:23:16 +02:00
parent 92fa1aa917
commit 2e63b6e02a
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/util/fairland.c
View file

@ -109,15 +109,6 @@
#include "version.h" #include "version.h"
#include "xy.h" #include "xy.h"
static int quiet = 0;
/* If you don't specify these command line arguments, then these are the
defaults */
#define DEFAULT_SPIKE 10
#define DEFAULT_MOUNTAIN 0
#define DEFAULT_CONTDIST 2
#define DEFAULT_ISLDIST 1
/* The following five numbers refer to elevation under which (in the case of /* The following five numbers refer to elevation under which (in the case of
fertility or oil) or over which (in the case of iron, gold, and uranium) fertility or oil) or over which (in the case of iron, gold, and uranium)
sectors with that elevation will contain that resource. Elevation ranges sectors with that elevation will contain that resource. Elevation ranges
@ -147,14 +138,26 @@ static int quiet = 0;
static void qprint(const char * const fmt, ...) static void qprint(const char * const fmt, ...)
ATTRIBUTE((format (printf, 1, 2))); ATTRIBUTE((format (printf, 1, 2)));
#define DEFAULT_OUTFILE_NAME "newcap_script" /*
static const char *outfile = DEFAULT_OUTFILE_NAME; * Program arguments and options
*/
static char *program_name;
static int nc, sc; /* number and size of continents */
static int ni, is; /* number and size of islands */
#define DEFAULT_SPIKE 10
static int sp; /* spike percentage */
#define DEFAULT_MOUNTAIN 0
static int pm; /* mountain percentage */
#define DEFAULT_CONTDIST 2
static int di; /* min. distance between continents */
#define DEFAULT_ISLDIST 1
static int id; /* ... continents and islands */
/* don't let the islands crash into each other. /* don't let the islands crash into each other.
1 = don't merge, 0 = merge. */ 1 = don't merge, 0 = merge. */
static int DISTINCT_ISLANDS = 1; static int DISTINCT_ISLANDS = 1;
static int quiet;
static char *program_name; #define DEFAULT_OUTFILE_NAME "newcap_script"
static const char *outfile = DEFAULT_OUTFILE_NAME;
#define STABLE_CYCLE 4 /* stability required for perterbed capitals */ #define STABLE_CYCLE 4 /* stability required for perterbed capitals */
#define INFINITY 999 /* a number which means "BIG" */ #define INFINITY 999 /* a number which means "BIG" */
@ -178,7 +181,6 @@ static int secs; /* number of sectors grown */
static int ctot; /* total number of continents and islands grown */ static int ctot; /* total number of continents and islands grown */
static int *isecs; /* array of how large each island is */ static int *isecs; /* array of how large each island is */
static int nc, sc, di, sp, pm, ni, is, id; /* the 8 args to this program */
static int *capx, *capy; /* location of the nc capitals */ static int *capx, *capy; /* location of the nc capitals */
static int *mc, mcc; /* array and counter used for stability static int *mc, mcc; /* array and counter used for stability
check when perturbing */ check when perturbing */