diff --git a/src/jsreport.c b/src/jsreport.c index 4c9890329..2ea46b678 100644 --- a/src/jsreport.c +++ b/src/jsreport.c @@ -1,9 +1,11 @@ #include "reports.h" #include "jsreport.h" -#include "kernel/region.h" -#include "kernel/terrain.h" -#include "kernel/terrainid.h" -#include "kernel/config.h" +#include +#include +#include +#include + +#include #include #include @@ -56,6 +58,9 @@ static int report_json(const char *filename, report_context * ctx, const char *c sr = find_seen(ctx->seen, r); if (sr) { terrain_t ter = oldterrain(r->terrain); + if (ter != NOTERRAIN) { + log_warning("report_json: %s has no terrain id\n", r->terrain->_name); + } data = 1 + (int)ter; } } diff --git a/src/kernel/terrain.c b/src/kernel/terrain.c index 313811b47..36efb3591 100644 --- a/src/kernel/terrain.c +++ b/src/kernel/terrain.c @@ -133,7 +133,7 @@ terrain_t oldterrain(const struct terrain_type * terrain) if (newterrains[t] == terrain) return t; } - log_warning("%s is not a classic terrain.\n", terrain->_name); + log_debug("%s is not a classic terrain.\n", terrain->_name); return NOTERRAIN; } diff --git a/src/util/log.h b/src/util/log.h index 1e56d4b34..2a206b55b 100644 --- a/src/util/log.h +++ b/src/util/log.h @@ -20,8 +20,8 @@ extern "C" { extern void log_flush(void); /* use macros above instead of these: */ - extern void log_warning(const char *format, ...); extern void log_error(const char *format, ...); + extern void log_warning(const char *format, ...); extern void log_debug(const char *format, ...); extern void log_info(const char *format, ...); extern void log_printf(FILE * ios, const char *format, ...);