diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index d4dd290a5..03b3b98c6 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -97,6 +97,7 @@ #include #include #include +#include #include @@ -3826,8 +3827,16 @@ use_cmd(unit * u, struct order * ord) t = getstrtoken(); n = atoi(t); if (n==0) { - n = 1; + if (findparam(t, u->faction->locale) == P_ANY) { + /* BENUTZE ALLES Yanxspirit */ + n = INT_MAX; + t = getstrtoken(); + } else { + /* BENUTZE Yanxspirit */ + n = 1; + } } else { + /* BENUTZE 42 Yanxspirit */ t = getstrtoken(); } itype = finditemtype(t, u->faction->locale); diff --git a/src/common/kernel/reports.c b/src/common/kernel/reports.c index 66daac17a..e5f823291 100644 --- a/src/common/kernel/reports.c +++ b/src/common/kernel/reports.c @@ -1572,16 +1572,6 @@ report_donations(void) } } -static const char* -MailitPath(void) -{ - static const char * value = NULL; - if (value==NULL) { - value = get_param(global.parameters, "report.mailit"); - } - return value; -} - static void write_script(FILE * F, const faction * f) { @@ -1720,4 +1710,4 @@ reports_init(void) /* register alternative visibility functions */ register_function((pf_generic)view_neighbours, "view_neighbours"); register_function((pf_generic)view_regatta, "view_regatta"); -} \ No newline at end of file +} diff --git a/src/common/kernel/reports.h b/src/common/kernel/reports.h index 436c2659e..8a04991a8 100644 --- a/src/common/kernel/reports.h +++ b/src/common/kernel/reports.h @@ -94,7 +94,7 @@ typedef struct report_context { void * userdata; } report_context; -typedef void (*report_fun)(FILE * F, report_context * ctx); +typedef int (*report_fun)(FILE * F, report_context * ctx); extern void register_reporttype(const char * extension, report_fun write, int flag); extern void report_item(const struct unit * owner, const struct item * i, const struct faction * viewer, const char ** name, const char ** basename, int * number, boolean singular);