fairland: Move qprint() and NUMTRIES

[empserver] / src / util / fairland.c

diff --git a/src/util/fairland.c b/src/util/fairland.c
index 097c17177a32934779573cb3a8954211539b5480..22a953929d24652ed8c5f29e1b5b65d28e8e2fb2 100644 (file)
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -129,6 +129,11 @@
 #include "version.h"
 #include "xy.h"
 
+/*
+ * Number of retries when growing land fails
+ */
+#define NUMTRIES 10
+
 /* do not change these defines */
 #define LANDMIN                1       /* plate altitude for normal land */
 #define PLATMIN                36      /* plate altitude for plateau */
@@ -188,9 +193,6 @@ struct resource_point uran_conf[] = {
     { 98, 0 },
     { 127, 0 } };
 
-static void qprint(const char * const fmt, ...)
-    ATTRIBUTE((format (printf, 1, 2)));
-
 /*
  * Program arguments and options
  */
@@ -222,13 +224,27 @@ static const char *outfile = DEFAULT_OUTFILE_NAME;
 #define new_x(newx) (((newx) + WORLD_X) % WORLD_X)
 #define new_y(newy) (((newy) + WORLD_Y) % WORLD_Y)
 
+struct xy {
+    coord x, y;
+};
+
+/*
+ * Capital locations
+ * The i-th capital is at cap[i].
+ */
+static struct xy *cap;
+
 /*
  * Island sizes
  * isecs[i] is the size of the i-th island.
  */
 static int *isecs;
 
-static int *capx, *capy;       /* location of the nc capitals */
+/*
+ * Island sectors
+ * The i-th island's j-th sector is at sect[i][j].
+ */
+struct xy **sect;
 
 /*
  * Island at x, y
@@ -286,32 +302,29 @@ static unsigned short *distance;
 static int *bfs_queue;
 static int bfs_queue_head, bfs_queue_tail;
 
-static int **sectx, **secty;   /* the sectors for each continent */
-
-#define NUMTRIES 10            /* keep trying to grow this many times */
-
 static const char *numletter =
     "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
+static void print_vars(void);
+static void qprint(const char * const fmt, ...)
+    ATTRIBUTE((format (printf, 1, 2)));
 static void help(char *);
 static void usage(void);
 static void parse_args(int argc, char *argv[]);
 static void allocate_memory(void);
 static void init(void);
 static int drift(void);
+static int stable(int);
+static void fl_move(int);
 static int grow_continents(void);
+static int grow_islands(void);
 static void create_elevations(void);
-static void write_sects(void);
-static void output(void);
-static int write_newcap_script(void);
-static int stable(int);
 static void elevate_prep(void);
 static void elevate_land(void);
 static void elevate_sea(void);
-
-static void print_vars(void);
-static void fl_move(int);
-static int grow_islands(void);
+static void write_sects(void);
+static void output(void);
+static int write_newcap_script(void);
 
 /* Debugging aids: */
 void print_own_map(void);
@@ -441,6 +454,18 @@ print_vars(void)
     printf("World dimensions: %dx%d\n", WORLD_X, WORLD_Y);
 }
 
+static void
+qprint(const char *const fmt, ...)
+{
+    va_list ap;
+
+    if (!quiet) {
+       va_start(ap, fmt);
+       vfprintf(stdout, fmt, ap);
+       va_end(ap);
+    }
+}
+
 static void
 help(char *complaint)
 {
@@ -581,8 +606,7 @@ allocate_memory(void)
 {
     int i;
 
-    capx = calloc(nc, sizeof(int));
-    capy = calloc(nc, sizeof(int));
+    cap = malloc(nc * sizeof(*cap));
     own = malloc(WORLD_SZ() * sizeof(*own));
     adj_land = malloc(WORLD_SZ() * sizeof(*adj_land));
     elev = calloc(WORLD_SZ(), sizeof(*elev));
@@ -591,18 +615,12 @@ allocate_memory(void)
     closest = malloc(WORLD_SZ() * sizeof(*closest));
     distance = malloc(WORLD_SZ() * sizeof(*distance));
     bfs_queue = malloc(WORLD_SZ() * sizeof(*bfs_queue));
-    sectx = calloc(nc + ni, sizeof(int *));
-    secty = calloc(nc + ni, sizeof(int *));
     isecs = calloc(nc + ni, sizeof(int));
-    for (i = 0; i < nc; ++i) {
-       sectx[i] = calloc(sc, sizeof(int));
-       secty[i] = calloc(sc, sizeof(int));
-    }
-    for (i = nc; i < nc + ni; ++i) {
-       sectx[i] = calloc(is * 2, sizeof(int));
-       secty[i] = calloc(is * 2, sizeof(int));
-    }
-
+    sect = malloc((nc + ni) * sizeof(*sect));
+    for (i = 0; i < nc; i++)
+       sect[i] = malloc(sc * sizeof(**sect));
+    for (i = nc; i < nc + ni; i++)
+       sect[i] = malloc(is * 2 * sizeof(**sect));
 }
 
 static void
@@ -632,7 +650,7 @@ iso(int j, int newx, int newy)
     for (i = 0; i < nc; ++i) {
        if (i == j)
            continue;
-       md = mapdist(capx[i], capy[i], newx, newy);
+       md = mapdist(cap[i].x, cap[i].y, newx, newy);
        if (md < d)
            d = md;
     }
@@ -650,9 +668,9 @@ drift(void)
     int turns, i;
 
     for (i = 0; i < nc; i++) {
-       capy[i] = (2 * i) / WORLD_X;
-       capx[i] = (2 * i) % WORLD_X + capy[i] % 2;
-       if (capy[i] >= WORLD_Y) {
+       cap[i].y = (2 * i) / WORLD_X;
+       cap[i].x = (2 * i) % WORLD_X + cap[i].y % 2;
+       if (cap[i].y >= WORLD_Y) {
            fprintf(stderr,
                    "%s: world not big enough for all the continents\n",
                    program_name);
@@ -688,7 +706,7 @@ stable(int turns)
        return 0;
 
     for (i = 0; i < nc; ++i) {
-       isod = iso(i, capx[i], capy[i]);
+       isod = iso(i, cap[i].x, cap[i].y);
        if (isod > d)
            d = isod;
     }
@@ -713,12 +731,12 @@ fl_move(int j)
     for (i = 0; i < 6; i++) {
        if (dir > DIR_LAST)
            dir -= 6;
-       newx = new_x(capx[j] + diroff[dir][0]);
-       newy = new_y(capy[j] + diroff[dir][1]);
+       newx = new_x(cap[j].x + diroff[dir][0]);
+       newy = new_y(cap[j].y + diroff[dir][1]);
        dir++;
-       if (iso(j, newx, newy) >= iso(j, capx[j], capy[j])) {
-           capx[j] = newx;
-           capy[j] = newy;
+       if (iso(j, newx, newy) >= iso(j, cap[j].x, cap[j].y)) {
+           cap[j].x = newx;
+           cap[j].y = newy;
            return;
        }
     }
@@ -817,7 +835,7 @@ xzone_around_island(int c, int dist)
     int i;
 
     for (i = 0; i < isecs[c]; i++)
-       xzone_around_sector(c, sectx[c][i], secty[c][i], dist);
+       xzone_around_sector(c, sect[c][i].x, sect[c][i].y, dist);
 }
 
 /*
@@ -910,8 +928,8 @@ bfs_enqueue_island(int c)
     int i;
 
     for (i = 0; i < isecs[c]; i++) {
-       if (is_coastal(sectx[c][i], secty[c][i]))
-           bfs_enqueue(c, sectx[c][i], secty[c][i], 0);
+       if (is_coastal(sect[c][i].x, sect[c][i].y))
+           bfs_enqueue(c, sect[c][i].x, sect[c][i].y, 0);
     }
 }
 
@@ -1030,8 +1048,8 @@ add_sector(int c, int x, int y)
 
     assert(own[off] == -1);
     xzone_around_sector(c, x, y, c < nc ? di : DISTINCT_ISLANDS ? id : 0);
-    sectx[c][isecs[c]] = x;
-    secty[c][isecs[c]] = y;
+    sect[c][isecs[c]].x = x;
+    sect[c][isecs[c]].y = y;
     isecs[c]++;
     own[off] = c;
     adj_land_update(x, y);
@@ -1069,8 +1087,8 @@ grow_one_sector(int c)
     newx = newy = -1;
 
     for (i = 0; i < isecs[c]; i++) {
-       x = sectx[c][i];
-       y = secty[c][i];
+       x = sect[c][i].x;
+       y = sect[c][i].y;
        off = XYOFFSET(x, y);
 
        for (dir = DIR_FIRST; dir <= DIR_LAST; dir++) {
@@ -1116,13 +1134,13 @@ grow_continents(void)
 
     for (c = 0; c < nc; ++c) {
        isecs[c] = 0;
-       if (!can_grow_at(c, capx[c], capy[c])
-           || !can_grow_at(c, new_x(capx[c] + 2), capy[c])) {
+       if (!can_grow_at(c, cap[c].x, cap[c].y)
+           || !can_grow_at(c, new_x(cap[c].x + 2), cap[c].y)) {
            done = 0;
            continue;
        }
-       add_sector(c, capx[c], capy[c]);
-       add_sector(c, new_x(capx[c] + 2), capy[c]);
+       add_sector(c, cap[c].x, cap[c].y);
+       add_sector(c, new_x(cap[c].x + 2), cap[c].y);
     }
 
     if (!done) {
@@ -1250,8 +1268,8 @@ grow_islands(void)
                if (isecs[c + j] != secs) {
                    isecs[c + j]--;
                    assert(isecs[c + j] == secs);
-                   x = sectx[c + j][secs];
-                   y = secty[c + j][secs];
+                   x = sect[c + j][secs].x;
+                   y = sect[c + j][secs].y;
                    own[XYOFFSET(x, y)] = -1;
                    adj_land_update(x, y);
                }
@@ -1344,9 +1362,9 @@ elevate_land(void)
        i0 = c < nc ? 2 : 0;
        n = isecs[c] - i0;
        for (i = 0; i < i0; i++)
-           elev[XYOFFSET(sectx[c][i], secty[c][i])] = PLATMIN;
+           elev[XYOFFSET(sect[c][i].x, sect[c][i].y)] = PLATMIN;
        for (i = 0; i < n; i++)
-           off[i] = XYOFFSET(sectx[c][i0 + i], secty[c][i0 + i]);
+           off[i] = XYOFFSET(sect[c][i0 + i].x, sect[c][i0 + i].y);
        qsort(off, n, sizeof(*off), elev_cmp);
        delta = (double)(HIGHMIN - LANDMIN - 1) / (n - nm - 1);
        elevation = LANDMIN;
@@ -1475,8 +1493,8 @@ output(void)
                    printf("%% ");
                else {
                    assert(0 <= c && c < nc);
-                   if ((x == capx[c] || x == new_x(capx[c] + 2))
-                       && y == capy[c])
+                   if ((x == cap[c].x || x == new_x(cap[c].x + 2))
+                       && y == cap[c].y)
                        printf("%c ", numletter[c % 62]);
                    else
                        printf("# ");
@@ -1654,21 +1672,9 @@ write_newcap_script(void)
 
     for (c = 0; c < nc; ++c) {
        fprintf(script, "add %d %d %d p\n", c + 1, c + 1, c + 1);
-       fprintf(script, "newcap %d %d,%d\n", c + 1, capx[c], capy[c]);
+       fprintf(script, "newcap %d %d,%d\n", c + 1, cap[c].x, cap[c].y);
     }
     fprintf(script, "add %d visitor visitor v\n", c + 1);
     fclose(script);
     return 1;
 }
-
-static void
-qprint(const char *const fmt, ...)
-{
-    va_list ap;
-
-    if (!quiet) {
-       va_start(ap, fmt);
-       vfprintf(stdout, fmt, ap);
-       va_end(ap);
-    }
-}