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

(update_coastal_flag, coast_sea_to_land, coastal_land_to_sea): Return

Browse source 
new coastal flag instead of updating the sector.  This is a bit
simpler.  Change arguments from sectors to coordinates to make it
obvious that the sector is not touched.
(set_coastal): Update the coastal flag, but leave putsect() to
callers.  All existing callers do that anyway.
This commit is contained in:
Markus Armbruster 2006-07-21 18:01:28 +00:00
parent f760628d77
commit ad0a37eca4
1 changed files with 32 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,81 +38,69 @@
#include "prototypes.h" #include "prototypes.h"
#include "sect.h" #include "sect.h"
static void static int
update_coastal_flag(struct sctstr *sp, struct sctstr *sectp) update_coastal_flag(coord x, coord y, coord ign_x, coord ign_y)
{ {
int n; int n;
struct sctstr sect; struct sctstr sect;
for (n = 1; n <= 6; n++) { /* Directions */ for (n = 1; n <= 6; n++) { /* Directions */
getsect(sp->sct_x + diroff[n][0], sp->sct_y + diroff[n][1], &sect); getsect(x + diroff[n][0], y + diroff[n][1], &sect);
if (sectp && sectp->sct_x == sect.sct_x && if (sect.sct_x == ign_x && sect.sct_y == ign_y)
sectp->sct_y == sect.sct_y)
continue; continue;
if (sect.sct_type == SCT_WATER || sect.sct_type == SCT_BTOWER || if (sect.sct_type == SCT_WATER || sect.sct_type == SCT_BTOWER ||
sect.sct_type == SCT_BSPAN) { sect.sct_type == SCT_BSPAN)
if (!sp->sct_coastal) { return 1;
sp->sct_coastal = 1;
putsect(sp);
}
return;
}
}
if (sp->sct_coastal) {
sp->sct_coastal = 0;
putsect(sp);
}
} }
static void return 0;
coastal_sea_to_land(struct sctstr *sp) }
static int
coastal_sea_to_land(coord x, coord y)
{ {
int n; int n, c;
struct sctstr sect; struct sctstr sect;
update_coastal_flag(sp, NULL);
for (n = 1; n <= 6; n++) { /* Directions */ for (n = 1; n <= 6; n++) { /* Directions */
getsect(sp->sct_x + diroff[n][0], sp->sct_y + diroff[n][1], &sect); getsect(x + diroff[n][0], y + diroff[n][1], &sect);
update_coastal_flag(&sect, sp); c = update_coastal_flag(sect.sct_x, sect.sct_y, x, y);
if (!sect.sct_coastal != !c) {
sect.sct_coastal = c;
putsect(&sect);
} }
} }
static void return update_coastal_flag(x, y, x, y);
coastal_land_to_sea(struct sctstr *sp) }
static int
coastal_land_to_sea(coord x, coord y)
{ {
int n; int n;
struct sctstr sect; struct sctstr sect;
sp->sct_coastal = 1;
putsect(sp);
for (n = 1; n <= 6; ++n) { /* Directions */ for (n = 1; n <= 6; ++n) { /* Directions */
getsect(sp->sct_x + diroff[n][0], sp->sct_y + diroff[n][1], &sect); getsect(x + diroff[n][0], y + diroff[n][1], &sect);
if (!sect.sct_coastal) { if (!sect.sct_coastal) {
sect.sct_coastal = 1; sect.sct_coastal = 1;
putsect(&sect); putsect(&sect);
} }
} }
return 1;
} }
void void
set_coastal(struct sctstr *sp, int des) set_coastal(struct sctstr *sp, int des)
{ {
int old_water = 0; int old_water = sp->sct_type == SCT_WATER
int new_water = 0; || sp->sct_type == SCT_BTOWER || sp->sct_type == SCT_BSPAN;
int new_water = des == SCT_WATER
|| des == SCT_BTOWER || des == SCT_BSPAN;
if (sp->sct_type == SCT_WATER || sp->sct_type == SCT_BTOWER || if (new_water != old_water)
sp->sct_type == SCT_BSPAN) sp->sct_coastal = new_water
old_water = 1; ? coastal_land_to_sea(sp->sct_x, sp->sct_y)
: coastal_sea_to_land(sp->sct_x, sp->sct_y);
if (des == SCT_WATER || des == SCT_BTOWER || des== SCT_BSPAN)
new_water = 1;
if (new_water == old_water)
return;
else if (new_water)
coastal_land_to_sea(sp);
else
coastal_sea_to_land(sp);
} }