From 49c494a8d7691760a73ca5edf5aa08551d291ee6 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 9 Aug 2020 18:01:19 +0200 Subject: [PATCH] fairland: Drop try_to_grow() parameter @extra_dist The previous commit removed the only call passing non-zero @extra_dist. Drop the parameter. Signed-off-by: Markus Armbruster --- src/util/fairland.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/src/util/fairland.c b/src/util/fairland.c index 712d80897..ca1253710 100644 --- a/src/util/fairland.c +++ b/src/util/fairland.c @@ -778,25 +778,11 @@ add_sector(int c, int x, int y) } static int -try_to_grow(int c, int newx, int newy, int extra_dist) +try_to_grow(int c, int newx, int newy) { - int d = c < nc ? di : id; - int i, px, py; - struct hexagon_iter hexit; - if (!can_grow_at(c, newx, newy)) return 0; - for (i = 1; i <= extra_dist; i++) { - hexagon_first(&hexit, newx, newy, d + i, &px, &py); - do { - if (own[px][py] != -1 && - own[px][py] != c && - (DISTINCT_ISLANDS || own[px][py] < nc)) - return 0; - } while (hexagon_next(&hexit, &px, &py)); - } - add_sector(c, newx, newy); return 1; } @@ -876,14 +862,14 @@ grow_one_sector(int c) if (n > 5 || (own[new_x(x+dirx[(i+5)%6])][new_y(y+diry[(i+5)%6])] == -1 && own[new_x(x+dirx[(i+1)%6])][new_y(y+diry[(i+1)%6])] == -1)) - if (try_to_grow(c, newx, newy, 0)) + if (try_to_grow(c, newx, newy)) done = 1; } } else for (i = roll0(6), n = 0; n < 6 && !done; i = (i + 1) % 6, ++n) { newx = new_x(x + dirx[i]); newy = new_y(y + diry[i]); - if (try_to_grow(c, newx, newy, 0)) + if (try_to_grow(c, newx, newy)) done = 1; } next_coast(c, x, y, &x, &y); @@ -908,8 +894,8 @@ grow_continents(void) for (c = 0; c < nc; ++c) { isecs[c] = 0; - if (!try_to_grow(c, capx[c], capy[c], 0) - || !try_to_grow(c, new_x(capx[c] + 2), capy[c], 0)) { + if (!try_to_grow(c, capx[c], capy[c]) + || !try_to_grow(c, new_x(capx[c] + 2), capy[c])) { done = 0; continue; } -- 2.43.0