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

clarify dragon planning code (bug 2159)

This commit is contained in:
Enno Rehling 2015-11-16 16:57:51 +01:00
parent d91c9fb880
commit efc87a16e3
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/monsters.c
View File

@ -685,16 +685,15 @@ static order *plan_dragon(unit * u)
/* dragon gets bored and looks for a different place to go */ /* dragon gets bored and looks for a different place to go */
ta = set_new_dragon_target(u, u->region, DRAGON_RANGE); ta = set_new_dragon_target(u, u->region, DRAGON_RANGE);
} }
else
ta = a_find(u->attribs, &at_targetregion);
if (ta != NULL) { if (ta != NULL) {
tr = (region *)ta->data.v; tr = (region *)ta->data.v;
if (tr == NULL || !path_exists(u->region, tr, DRAGON_RANGE, allowed_dragon)) { if (tr == NULL || !path_exists(u->region, tr, DRAGON_RANGE, allowed_dragon)) {
ta = set_new_dragon_target(u, u->region, DRAGON_RANGE); ta = set_new_dragon_target(u, u->region, DRAGON_RANGE);
if (ta) if (ta) {
tr = findregion(ta->data.sa[0], ta->data.sa[1]); tr = findregion(ta->data.sa[0], ta->data.sa[1]);
} }
} }
}
if (tr != NULL) { if (tr != NULL) {
assert(long_order == NULL); assert(long_order == NULL);
switch (old_race(u_race(u))) { switch (old_race(u_race(u))) {

9
src/reports.c
View File

@ -1547,6 +1547,7 @@ static void mkreportdir(const char *rpath) {
abort(); abort();
} }
} }
errno = 0;
} }
int write_reports(faction * f, time_t ltime) int write_reports(faction * f, time_t ltime)
@ -1563,11 +1564,7 @@ int write_reports(faction * f, time_t ltime)
} }
prepare_report(&ctx, f); prepare_report(&ctx, f);
get_addresses(&ctx); get_addresses(&ctx);
mkreportdir(path); mkreportdir(path); // FIXME: too many mkdir calls! init_reports is enough
if (errno) {
log_warning("errno was %d before writing reports", errno);
errno = 0;
}
log_debug("Reports for %s:", factionname(f)); log_debug("Reports for %s:", factionname(f));
for (rtype = report_types; rtype != NULL; rtype = rtype->next) { for (rtype = report_types; rtype != NULL; rtype = rtype->next) {
if (f->options & rtype->flag) { if (f->options & rtype->flag) {
@ -1662,7 +1659,7 @@ int reports(void)
report_donations(); report_donations();
remove_empty_units(); remove_empty_units();
mkreportdir(rpath); mkreportdir(rpath); // FIXME: init_reports already does this?
sprintf(path, "%s/reports.txt", rpath); sprintf(path, "%s/reports.txt", rpath);
mailit = fopen(path, "w"); mailit = fopen(path, "w");
if (mailit == NULL) { if (mailit == NULL) {