fairland: Fuse capx[], capy[] into cap[]

[empserver] / src / util / fairland.c

diff --git a/src/util/fairland.c b/src/util/fairland.c
index 8c12a8c74b0368d7912028ad5a5bbc29450cf778..338f25967c3e23ef4994201e246e79ec62d0c47e 100644 (file)
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -222,13 +222,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,8 +300,6 @@ 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 =
@@ -581,8 +593,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 +602,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 +637,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 +655,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 +693,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 +718,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 +822,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 +915,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 +1035,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 +1074,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 +1121,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 +1255,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 +1349,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;
@@ -1434,19 +1439,17 @@ add_resources(struct sctstr *sct)
 static void
 write_sects(void)
 {
-    struct sctstr *sct;
-    int x, y;
+    struct sctstr *sp;
+    int i;
 
-    for (y = 0; y < WORLD_Y; y++) {
-       for (x = y % 2; x < WORLD_X; x += 2) {
-           sct = getsectp(x, y);
-           sct->sct_elev = elev[sct->sct_uid];
-           sct->sct_type = elev_to_sct_type(sct->sct_elev);
-           sct->sct_newtype = sct->sct_type;
-           sct->sct_dterr = own[sct->sct_uid] + 1;
-           sct->sct_coastal = is_coastal(sct->sct_x, sct->sct_y);
-           add_resources(sct);
-       }
+    for (i = 0; i < WORLD_SZ(); i++) {
+       sp = getsectid(i);
+       sp->sct_elev = elev[i];
+       sp->sct_type = elev_to_sct_type(sp->sct_elev);
+       sp->sct_newtype = sp->sct_type;
+       sp->sct_dterr = own[i] + 1;
+       sp->sct_coastal = is_coastal(sp->sct_x, sp->sct_y);
+       add_resources(sp);
     }
 }
 
@@ -1477,8 +1480,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("# ");
@@ -1656,7 +1659,7 @@ 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);