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

fairland: Rename INFINITY to INFINITE_ELEVATION

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-08-08 13:59:37 +02:00
parent 380d2e9f55
commit cd7c4cdf20
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/util/fairland.c
View file

@ -162,7 +162,7 @@ static int quiet;
static const char *outfile = DEFAULT_OUTFILE_NAME; static const char *outfile = DEFAULT_OUTFILE_NAME;
#define STABLE_CYCLE 4 /* stability required for perterbed capitals */ #define STABLE_CYCLE 4 /* stability required for perterbed capitals */
#define INFINITY 999 /* a number which means "BIG" */ #define INFINITE_ELEVATION 999
/* these defines prevent infinite loops: /* these defines prevent infinite loops:
*/ */
@ -916,7 +916,7 @@ create_elevations(void)
for (i = 0; i < WORLD_X; i++) { for (i = 0; i < WORLD_X; i++) {
for (j = 0; j < WORLD_Y; j++) for (j = 0; j < WORLD_Y; j++)
elev[i][j] = -INFINITY; elev[i][j] = -INFINITE_ELEVATION;
} }
elevate_land(); elevate_land();
elevate_sea(); elevate_sea();
@ -944,7 +944,7 @@ distance_to_what(int x, int y, int flag)
return d; return d;
break; break;
case 2: /* distance to mountain */ case 2: /* distance to mountain */
if (elev[px][py] == INFINITY) if (elev[px][py] == INFINITE_ELEVATION)
return d; return d;
break; break;
} }
@ -982,13 +982,13 @@ elevate_land(void)
++mountain_search) { ++mountain_search) {
r = roll0(total); r = roll0(total);
for (i = 0; i < ns; ++i) for (i = 0; i < ns; ++i)
if (r < weight[i] && ELEV == -INFINITY && if (r < weight[i] && ELEV == -INFINITE_ELEVATION &&
(c >= nc || (c >= nc ||
((!(capx[c] == sectx[c][i] && ((!(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] &&
capy[c] == secty[c][i]))))) { capy[c] == secty[c][i]))))) {
ELEV = INFINITY; ELEV = INFINITE_ELEVATION;
break; break;
} }
--k; --k;
@ -1000,12 +1000,12 @@ elevate_land(void)
dmoun[i] = distance_to_mountain(); dmoun[i] = distance_to_mountain();
dk = (ns - nm - ((c < nc) ? 3 : 1) > 0) ? dk = (ns - nm - ((c < nc) ? 3 : 1) > 0) ?
(100 * (HIGHMIN - LANDMIN)) / (ns - nm - ((c < nc) ? 3 : 1)) : (100 * (HIGHMIN - LANDMIN)) / (ns - nm - ((c < nc) ? 3 : 1)) :
100 * INFINITY; 100 * INFINITE_ELEVATION;
for (k = 100 * (HIGHMIN - 1);; k -= dk) { for (k = 100 * (HIGHMIN - 1);; k -= dk) {
highest = 0; highest = 0;
where = -1; where = -1;
for (i = 0; i < ns; ++i) { for (i = 0; i < ns; ++i) {
if (ELEV == -INFINITY && if (ELEV == -INFINITE_ELEVATION &&
(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] &&
@ -1031,7 +1031,7 @@ elevate_land(void)
/* Elevate the mountains and capitals */ /* Elevate the mountains and capitals */
for (i = 0; i < ns; ++i) { for (i = 0; i < ns; ++i) {
if (ELEV == INFINITY) { if (ELEV == INFINITE_ELEVATION) {
if (dsea[i] == 1) if (dsea[i] == 1)
ELEV = HILLMIN + roll0(PLATMIN - HILLMIN); ELEV = HILLMIN + roll0(PLATMIN - HILLMIN);
else else
@ -1055,7 +1055,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) {
if (elev[x][y] == -INFINITY) if (elev[x][y] == -INFINITE_ELEVATION)
elev[x][y] = -roll(distance_to_land() * 20 + 27); elev[x][y] = -roll(distance_to_land() * 20 + 27);
} }
} }