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

prepare_seen has to check for ctx->f. we are no longer preparing everyone at once

Browse source
This commit is contained in:
Enno Rehling 2016-09-13 07:46:08 +02:00
parent a67950433d
commit 652ead4f60
1 changed files with 30 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
src/reports.c
View file

@ -1249,8 +1249,9 @@ static void view_regatta(region * r, faction * f)
/** mark all regions seen by the lighthouse. /** mark all regions seen by the lighthouse.
*/ */
static void prepare_lighthouse(building * b, faction *f) static void prepare_lighthouse(building * b, report_context *ctx)
{ {
faction *f = ctx->f;
int range = lighthouse_range(b, f); int range = lighthouse_range(b, f);
quicklist *ql, *rlist = get_regions_distance(b->region, range); quicklist *ql, *rlist = get_regions_distance(b->region, range);
int qi; int qi;
@ -1378,7 +1379,7 @@ static void cb_add_seen(region *r, unit *u, void *cbdata) {
/** set region.seen based on visibility by one faction. /** set region.seen based on visibility by one faction.
* *
* this function may also update f->last and f->first for potential * this function may also update ctx->last and ctx->first for potential
* lighthouses and travelthru reports * lighthouses and travelthru reports
*/ */
void prepare_seen(report_context *ctx) void prepare_seen(report_context *ctx)
@ -1398,35 +1399,40 @@ void prepare_seen(report_context *ctx)
reorder_units(r); reorder_units(r);
/* region owner get the report from lighthouses */ if (fval(r, RF_LIGHTHOUSE)) {
if (fval(r, RF_LIGHTHOUSE) && rule_region_owners && bt_lighthouse) { /* region owners get the report from lighthouses */
for (b = rbuildings(r); b; b = b->next) { if (rule_region_owners && bt_lighthouse) {
if (b && b->type == bt_lighthouse) { for (b = rbuildings(r); b; b = b->next) {
u = building_owner(b); if (b && b->type == bt_lighthouse) {
if (u && u->faction==f) { u = building_owner(b);
prepare_lighthouse(b, f); if (u && u->faction==f) {
if (u_race(u) != get_race(RC_SPELL) || u->number == RS_FARVISION) { prepare_lighthouse(b, ctx);
faction_add_seen(f, r, seen_unit); if (u_race(u) != get_race(RC_SPELL) || u->number == RS_FARVISION) {
faction_add_seen(f, r, seen_unit);
}
} }
} }
} }
} }
}
for (u = r->units; u; u = u->next) {
if (u->faction==f) {
if (u_race(u) != get_race(RC_SPELL) || u->number == RS_FARVISION) {
faction_add_seen(f, r, seen_unit);
}
if (fval(r, RF_LIGHTHOUSE) {
// TODO: is the building big enough for the unit?
if (u->building && u->building->type == bt_lighthouse) {
/* we are in a lighthouse. add the regions we can see from here! */
prepare_lighthouse(u->building, ctx);
}
}
}
} }
for (u = r->units; u; u = u->next) {
if (u->building && u->building->type == bt_lighthouse) {
/* we are in a lighthouse. add the regions we can see from here! */
prepare_lighthouse(u->building, u->faction);
}
if (u_race(u) != get_race(RC_SPELL) || u->number == RS_FARVISION) {
faction_add_seen(f, r, seen_unit);
}
}
if (fval(r, RF_TRAVELUNIT)) { if (fval(r, RF_TRAVELUNIT)) {
travelthru_map(r, cb_add_seen, r); travelthru_map(r, cb_add_seen, ctx);
} }
} }
} }
@ -1441,34 +1447,6 @@ static void cb_set_last(region *r, unit *u, void *cbdata) {
static region *lastregion(faction * f) static region *lastregion(faction * f)
{ {
#ifdef SMART_INTERVALS #ifdef SMART_INTERVALS
unit *u = f->units;
region *r = f->last;
if (u == NULL)
return NULL;
if (r != NULL)
return r->next;
/* it is safe to start in the region of the first unit. */
f->last = u->region;
/* if regions have indices, we can skip ahead: */
for (u = u->nextF; u != NULL; u = u->nextF) {
r = u->region;
if (r->index > f->last->index)
f->last = r;
}
/* we continue from the best region and look for travelthru etc. */
for (r = f->last->next; r; r = r->next) {
/* search the region for travelthru-attributes: */
if (fval(r, RF_TRAVELUNIT)) {
travelthru_map(r, cb_set_last, f);
}
if (f->last == r)
continue;
if (check_leuchtturm(r, f))
f->last = r;
}
return f->last->next; return f->last->next;
#else #else
return NULL; return NULL;