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

Merge pull request #544 from ennorehling/develop 

issue #538: default terrain
This commit is contained in:
Enno Rehling 2016-08-21 05:04:52 +02:00 committed by GitHub
parent 17c88fa48d 6ca3f04b89
commit 8902187a9a
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf/e2/terrains.json
View File

@ -283,14 +283,6 @@
}, },
"wall1": { "wall1": {
"flags": [ "forbidden", "land" ] "flags": [ "forbidden", "land" ]
},
"default": {
"size": 0,
"herbs": [],
"seed": 0,
"road": 0,
"flags": [ "land", "walk", "sail", "fly" ],
"production": {}
} }
} }
} }

2
src/reports.c
View File

@ -1540,7 +1540,7 @@ int write_reports(faction * f, time_t ltime)
} }
prepare_report(&ctx, f); prepare_report(&ctx, f);
get_addresses(&ctx); get_addresses(&ctx);
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) {
int error = 0; int error = 0;