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

(cens, desi, dump, do_desi, doland, file_sct_init, grow_continents)

Browse source 
(grow_islands, set_coastal, update_coastal_flag, coast_sea_to_land)
(coast_land_to_sea): Determine sct_coastal flag when the sector type
is set.  Old method only updated the sct_coastal flag when doing
cens() or a dump().  Other uses of sct_coastal could get stale values,
including selector coastal.  Rework set_coastal() into NEW functions
update_coastal_flag(), coast_sea_to_land(), coast_land_to_sea() and
set_coastal().  Fix a bug where the deity designation would not
properly set the coastal flag.  Fix a bug where the one sector lake
would not properly compute coastal flag.  Fix a bug that makes
fairland treat the last sector it adds to an island as non-coastal.
This commit is contained in:
Ron Koenderink 2005-11-17 03:21:32 +00:00
parent 8f98e53a23
commit 7b94794365
9 changed files with 146 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/util/fairland.c
View file

@ -179,6 +179,7 @@ static void translate_continents(void);
static int map_symbol(int x, int y);
static void fl_sct_init(coord x, coord y, s_char *ptr,
time_t timestamp);
static void set_coastal_flags(void);
static void print_vars(void);
static void fl_move(int);
@ -775,6 +776,9 @@ grow_continents(void)
grow_one_sector(c);
}
}
for (c = 0; c < nc; ++c)
find_coast(c);
if (fl_status)
qprint("Only managed to grow %d out of %d sectors.\n", secs, sc);
ctot = nc;
@ -830,6 +834,7 @@ grow_islands(void)
++secs;
find_coast(c);
} while (secs < isiz && grow_one_sector(c));
find_coast(c);
qprint(" %d(%d)", c - nc + 1, secs);
isecs[c] = secs;
ctot = c;
@ -1107,6 +1112,7 @@ write_sects(void)
sects[capy[c]][capx[c] / 2 + capy[c] % 2].sct_type = SCT_AIRPT;
sects[capy[c]][capx[c] / 2 + capy[c] % 2].sct_newtype = SCT_AIRPT;
}
set_coastal_flags();
}
/****************************************************************************
@ -1275,4 +1281,19 @@ fl_sct_init(coord x, coord y, s_char *ptr, time_t timestamp)
sp->sct_rail = 0;
sp->sct_defense = 0;
sp->sct_timestamp = timestamp;
sp->sct_coastal = 1;
}
static void
set_coastal_flags(void)
{
int i, j;
qprint("setting coastal flags...\n");
for (i = 0; i < nc; ++i)
for (j = 0; j < sc; j++)
sects[secty[i][j]][sectx[i][j] / 2].sct_coastal = sectc[i][j];
for (i = nc; i < nc + ni; ++i)
for (j = 0; j < isecs[i]; j++)
sects[secty[i][j]][sectx[i][j] / 2].sct_coastal = sectc[i][j];
}