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

fairland: Use zero elevation for "not yet elevated"

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-08-16 17:46:54 +02:00
parent 54782fb4c1
commit fd64db89d2
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/util/fairland.c
View file

@ -1255,12 +1255,6 @@ grow_islands(void)
static void static void
create_elevations(void) create_elevations(void)
{ {
int i, j;
for (i = 0; i < WORLD_X; i++) {
for (j = 0; j < WORLD_Y; j++)
elev[i][j] = -INFINITE_ELEVATION;
}
init_distance_to_coast(); init_distance_to_coast();
elevate_land(); elevate_land();
elevate_sea(); elevate_sea();
@ -1327,7 +1321,7 @@ elevate_land(void)
for (i = 0; i < ns; ++i) { for (i = 0; i < ns; ++i) {
x = sectx[c][i]; x = sectx[c][i];
y = secty[c][i]; y = secty[c][i];
if (r < weight[i] && elev[x][y] == -INFINITE_ELEVATION && if (r < weight[i] && !elev[x][y] &&
(c >= nc || (c >= nc ||
((!(capx[c] == sectx[c][i] && ((!(capx[c] == sectx[c][i] &&
capy[c] == secty[c][i])) && capy[c] == secty[c][i])) &&
@ -1353,7 +1347,7 @@ elevate_land(void)
for (i = 0; i < ns; ++i) { for (i = 0; i < ns; ++i) {
x = sectx[c][i]; x = sectx[c][i];
y = secty[c][i]; y = secty[c][i];
if (elev[x][y] == -INFINITE_ELEVATION && if (!elev[x][y] &&
(c >= nc || ((!(capx[c] == sectx[c][i] && (c >= nc || ((!(capx[c] == sectx[c][i] &&
capy[c] == secty[c][i])) && capy[c] == secty[c][i])) &&
(!(new_x(capx[c] + 2) == sectx[c][i] && (!(new_x(capx[c] + 2) == sectx[c][i] &&
@ -1404,7 +1398,7 @@ elevate_sea(void)
for (y = 0; y < WORLD_Y; ++y) { for (y = 0; y < WORLD_Y; ++y) {
for (x = y % 2; x < WORLD_X; x += 2) { for (x = y % 2; x < WORLD_X; x += 2) {
off = XYOFFSET(x, y); off = XYOFFSET(x, y);
if (elev[x][y] == -INFINITE_ELEVATION) if (own[x][y] == -1)
elev[x][y] = -roll(MIN(5, distance[off]) * 20 + 27); elev[x][y] = -roll(MIN(5, distance[off]) * 20 + 27);
} }
} }