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

merge conflicts from the 13.2.3 release

This commit is contained in:
Enno Rehling 2017-07-09 10:42:10 +02:00
parent beecc0e323 7790ebd671
commit 6fa471bb97
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/reports.c
View File

@ -1370,6 +1370,9 @@ void reorder_units(region * r)
static region *lastregion(faction * f) static region *lastregion(faction * f)
{ {
if (!f->units) {
return NULL;
}
return f->last ? f->last->next : NULL; return f->last ? f->last->next : NULL;
} }
@ -1421,6 +1424,7 @@ void prepare_report(report_context *ctx, faction *f)
ctx->addresses = NULL; ctx->addresses = NULL;
ctx->userdata = NULL; ctx->userdata = NULL;
/* [first,last) interval of regions with a unit in it: */ /* [first,last) interval of regions with a unit in it: */
if (f->units) {
ctx->first = firstregion(f); ctx->first = firstregion(f);
ctx->last = lastregion(f); ctx->last = lastregion(f);
@ -1485,10 +1489,11 @@ void prepare_report(report_context *ctx, faction *f)
prepare_lighthouse(f, r, range); prepare_lighthouse(f, r, range);
} }
if (fval(r, RF_TRAVELUNIT) && r->seen.mode<seen_travel) { if (fval(r, RF_TRAVELUNIT) && r->seen.mode < seen_travel) {
travelthru_map(r, cb_add_seen, f); travelthru_map(r, cb_add_seen, f);
} }
} }
}
/* [fast,last) interval of seen regions (with lighthouses and travel) /* [fast,last) interval of seen regions (with lighthouses and travel)
* TODO: what about neighbours? when are they included? do we need * TODO: what about neighbours? when are they included? do we need
* them outside of the CR? */ * them outside of the CR? */