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

(swaps): Failed to update coastal flags. Was missed in the changeset

Browse source 
containing coastal.c rev. 1.1.
(set_coastal): New parameter olddes, to simplify fixing swaps().
Callers changed.
This commit is contained in:
Markus Armbruster 2006-07-21 18:10:09 +00:00
parent ad0a37eca4
commit 6db2e6ec63
5 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/lib/subs/coastal.c
View file

@ -91,13 +91,18 @@ coastal_land_to_sea(coord x, coord y)
return 1;
}
/*
* Compute coastal flags for a change of SP from OLDDES to NEWDES.
* Update adjacent sectors, but don't touch SP.
* Return new coastal flag for SP.
*/
void
set_coastal(struct sctstr *sp, int des)
set_coastal(struct sctstr *sp, int olddes, int newdes)
{
int old_water = sp->sct_type == SCT_WATER
|| sp->sct_type == SCT_BTOWER || sp->sct_type == SCT_BSPAN;
int new_water = des == SCT_WATER
|| des == SCT_BTOWER || des == SCT_BSPAN;
int old_water = olddes == SCT_WATER
|| olddes == SCT_BTOWER || olddes == SCT_BSPAN;
int new_water = newdes == SCT_WATER
|| newdes == SCT_BTOWER || newdes == SCT_BSPAN;
if (new_water != old_water)
sp->sct_coastal = new_water