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

fairland: Drop try_to_grow() parameter @extra_dist

Browse source 
The previous commit removed the only call passing non-zero
@extra_dist.  Drop the parameter.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-08-09 18:01:19 +02:00
parent eecb9c9825
commit 49c494a8d7
1 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/util/fairland.c
View file

@ -778,25 +778,11 @@ add_sector(int c, int x, int y)
} }
static int 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)) if (!can_grow_at(c, newx, newy))
return 0; 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); add_sector(c, newx, newy);
return 1; return 1;
} }
@ -876,14 +862,14 @@ grow_one_sector(int c)
if (n > 5 || 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+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)) 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; done = 1;
} }
} else } else
for (i = roll0(6), n = 0; n < 6 && !done; i = (i + 1) % 6, ++n) { for (i = roll0(6), n = 0; n < 6 && !done; i = (i + 1) % 6, ++n) {
newx = new_x(x + dirx[i]); newx = new_x(x + dirx[i]);
newy = new_y(y + diry[i]); newy = new_y(y + diry[i]);
if (try_to_grow(c, newx, newy, 0)) if (try_to_grow(c, newx, newy))
done = 1; done = 1;
} }
next_coast(c, x, y, &x, &y); next_coast(c, x, y, &x, &y);
@ -908,8 +894,8 @@ grow_continents(void)
for (c = 0; c < nc; ++c) { for (c = 0; c < nc; ++c) {
isecs[c] = 0; isecs[c] = 0;
if (!try_to_grow(c, capx[c], capy[c], 0) if (!try_to_grow(c, capx[c], capy[c])
|| !try_to_grow(c, new_x(capx[c] + 2), capy[c], 0)) { || !try_to_grow(c, new_x(capx[c] + 2), capy[c])) {
done = 0; done = 0;
continue; continue;
} }