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

115
src/lib/subs/coastal.c Normal file
View file

@ -0,0 +1,115 @@
/*
* Empire - A multi-player, client/server Internet based war game.
* Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* ---
*
* See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
* related information and legal notices. It is expected that any future
* projects/authors will amend these files as needed.
*
* ---
*
* coastal.c: Routines to calculate the coastal flag
*
* Known contributors to this file:
* Ron Koenderink, 2005
*
*/
#include "prototypes.h"
#include "file.h"
#include "path.h"
static void
update_coastal_flag(struct sctstr *sp, struct sctstr *sectp)
{
int n;
struct sctstr sect;
for (n = 1; n <= 6; n++) { /* Directions */
getsect(sp->sct_x + diroff[n][0], sp->sct_y + diroff[n][1], &sect);
if (sectp && sectp->sct_x == sect.sct_x &&
sectp->sct_y == sect.sct_y)
continue;
if (sect.sct_type == SCT_WATER || sect.sct_type == SCT_BTOWER ||
sect.sct_type == SCT_BSPAN) {
if (!sp->sct_coastal) {
sp->sct_coastal = 1;
putsect(sp);
}
return;
}
}
if (sp->sct_coastal) {
sp->sct_coastal = 0;
putsect(sp);
}
}
static void
coastal_sea_to_land(struct sctstr *sp, int des)
{
int n;
struct sctstr sect;
update_coastal_flag(sp, NULL);
for (n = 1; n <= 6; n++) { /* Directions */
getsect(sp->sct_x + diroff[n][0], sp->sct_y + diroff[n][1], &sect);
update_coastal_flag(&sect, sp);
}
}
static void
coastal_land_to_sea(struct sctstr *sp, int des)
{
int n;
struct sctstr sect;
sp->sct_coastal = 1;
putsect(sp);
for (n = 1; n <= 6; ++n) { /* Directions */
getsect(sp->sct_x + diroff[n][0], sp->sct_y + diroff[n][1], &sect);
if (!sect.sct_coastal) {
sect.sct_coastal = 1;
putsect(&sect);
}
}
}
void
set_coastal(struct sctstr *sp, int des)
{
int old_water = 0;
int new_water = 0;
if (sp->sct_type == SCT_WATER || sp->sct_type == SCT_BTOWER ||
sp->sct_type == SCT_BSPAN)
old_water = 1;
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, des);
else
coastal_sea_to_land(sp, des);
}