Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autoseed should not find old islands that are de-populated.

This commit is contained in:
Enno Rehling 2008-06-02 10:06:25 +00:00
parent 689dedae6d
commit 5f3bfa3a2c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/modules/autoseed.c
View File

@ -342,21 +342,21 @@ get_island(region * root, region_list ** rlist)
} }
static void static void
get_island_info(region * r, int * size_p, int * inhabited_p, int * maxage_p) get_island_info(region * root, int * size_p, int * inhabited_p, int * maxage_p)
{ {
int size = 0, maxage = 0, inhabited = 0; int size = 0, maxage = 0, inhabited = 0;
region_list * rlist = NULL; region_list * rlist = NULL;
region_list * island = NULL; region_list * island = NULL;
add_regionlist(&rlist, r); add_regionlist(&rlist, root);
island = rlist; island = rlist;
fset(r, RF_MARK); fset(root, RF_MARK);
while (rlist) { while (rlist) {
direction_t d; direction_t d;
r = rlist->data; region * r = rlist->data;
if (r->units) { if (r->units) {
unit * u; unit * u;
for (u=r->units; u; u=u->next) { for (u=r->units; u; u=u->next) {
if (u->faction->age > maxage) { if (!is_monsters(u->faction) && u->faction->age > maxage) {
maxage = u->faction->age; maxage = u->faction->age;
} }
} }
@ -468,15 +468,15 @@ autoseed(newfaction ** players, int nsize, int max_agediff)
*/ */
for (r=regions;r;r=r->next) { for (r=regions;r;r=r->next) {
struct plane * p = r->planep; struct plane * p = r->planep;
if (rterrain(r)==T_OCEAN && p==NULL && virgin_region(r)) { if (r->age<=max_agediff && rterrain(r)==T_OCEAN && p==NULL && virgin_region(r)) {
direction_t d; direction_t d;
for (d=0;d!=MAXDIRECTIONS;++d) { for (d=0;d!=MAXDIRECTIONS;++d) {
region * rn = rconnect(r, d); region * rn = rconnect(r, d);
if (rn && rn->land && virgin_region(rn)) { if (rn && rn->land && rn->age<=max_agediff && virgin_region(rn)) {
/* only expand islands that aren't single-islands and not too big already */ /* only expand islands that aren't single-islands and not too big already */
int size, inhabitants, maxage; int size, inhabitants, maxage;
get_island_info(rn, &size, &inhabitants, &maxage); get_island_info(rn, &size, &inhabitants, &maxage);
if (maxage<=max_agediff && size>2 && size<MAXISLANDSIZE) { if (maxage<=max_agediff && size>=2 && size<MAXISLANDSIZE) {
rmin = rn; rmin = rn;
break; break;
} }