"Neu entstandene Untote werden nur im CR angezeigt"
- reordering units before writing reports, not earlier
This commit is contained in:
Enno Rehling 2008-07-13 09:52:18 +00:00
parent d2c88d6660
commit a215f35f9f
3 changed files with 5 additions and 7 deletions

View File

@ -3924,7 +3924,6 @@ void
processorders (void) processorders (void)
{ {
static int init = 0; static int init = 0;
region *r;
const char * str; const char * str;
if (!init) { if (!init) {
@ -3947,12 +3946,6 @@ processorders (void)
* Beschreibungen geändert haben */ * Beschreibungen geändert haben */
update_spells(); update_spells();
warn_password(); warn_password();
/* we reorder the owners to be at the top of the building
* and also everyone in the same building/ship in sequence */
for (r = regions;r;r=r->next) {
reorder_units(r);
}
} }
int int

View File

@ -2236,6 +2236,7 @@ report_plaintext(const char * filename, report_context * ctx, const char * chars
nr_unit(F, f, u, 4, sr->mode); nr_unit(F, f, u, 4, sr->mode);
} }
} }
assert(!u->building);
u = u->next; u = u->next;
} }
while (sh) { while (sh) {
@ -2253,6 +2254,8 @@ report_plaintext(const char * filename, report_context * ctx, const char * chars
} }
} }
assert(!u);
rnl(F); rnl(F);
rpline(F); rpline(F);
} }

View File

@ -1275,6 +1275,8 @@ prepare_reports(void)
unit * u; unit * u;
plane * p = r->planep; plane * p = r->planep;
reorder_units(r);
if (p) { if (p) {
watcher * w = p->watchers; watcher * w = p->watchers;
for (;w;w=w->next) { for (;w;w=w->next) {