fairland: Move global variable @spike into grow_one_sector()

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/src/util/fairland.c b/src/util/fairland.c
index 35a580d7b15262c06d00e6a8ce6b311f29e3cbb2..d79143a77ae12784a1e9659d92cd01eea9963b4e 100644 (file)
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -184,7 +184,6 @@ static int *isecs;          /* array of how large each island is */
 static int *capx, *capy;       /* location of the nc capitals */
 static int *mc, mcc;           /* array and counter used for stability
                                   check when perturbing */
-static int spike;              /* are we spiking? */
 static int dirx[] = { -2, -1, 1, 2, 1, -1 }; /* gyujnb */
 static int diry[] = { 0, -1, -1, 0, 1, 1 };
 
@@ -719,7 +718,7 @@ next_coast(int c, int x, int y, int *xp, int *yp)
 */
 
 static int
-new_try(int c)
+new_try(int c, int spike)
 {
     int i, starti;
 
@@ -745,10 +744,10 @@ new_try(int c)
 static int
 grow_one_sector(int c)
 {
+    int spike = roll0(100) < sp;
     int done, coast_search, try1, x, y, newx, newy, i, n, sx, sy;
 
-    spike = roll0(100) < sp;
-    if ((try1 = new_try(c)) == -1)
+    if ((try1 = new_try(c, spike)) == -1)
        return 0;
     x = sx = sectx[c][try1];
     y = sy = secty[c][try1];