forked from github/server
Message-fixes
This commit is contained in:
parent
9762287e2e
commit
602853f0e2
|
@ -2794,7 +2794,6 @@ print_header(battle * b)
|
||||||
strcat(buf, " ");
|
strcat(buf, " ");
|
||||||
}
|
}
|
||||||
if (lastf) strcat(buf, lastf);
|
if (lastf) strcat(buf, lastf);
|
||||||
strcat(buf, ".");
|
|
||||||
|
|
||||||
m = msg_message("battle::starters", "factions", buf);
|
m = msg_message("battle::starters", "factions", buf);
|
||||||
message_faction(b, f, m);
|
message_faction(b, f, m);
|
||||||
|
|
|
@ -438,6 +438,10 @@ bufunit(const faction * f, const unit * u, int indent, int mode)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (getguard(u)) {
|
if (getguard(u)) {
|
||||||
|
rsize = strlcpy(bufp, ", ", size);
|
||||||
|
if (rsize>size) rsize = size-1;
|
||||||
|
size -= rsize;
|
||||||
|
bufp += rsize;
|
||||||
rsize = strlcpy(bufp, LOC(f->locale, "unit_guards"), size);
|
rsize = strlcpy(bufp, LOC(f->locale, "unit_guards"), size);
|
||||||
if (rsize>size) rsize = size-1;
|
if (rsize>size) rsize = size-1;
|
||||||
size -= rsize;
|
size -= rsize;
|
||||||
|
@ -1277,22 +1281,20 @@ write_reports(faction * f, time_t ltime)
|
||||||
get_seen_interval(&ctx);
|
get_seen_interval(&ctx);
|
||||||
get_addresses(&ctx);
|
get_addresses(&ctx);
|
||||||
|
|
||||||
printf("Reports für %s: ", factionname(f));
|
printf("Reports for %s:", factionname(f));
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
|
|
||||||
for (;rtype!=NULL;rtype=rtype->next) {
|
for (;rtype!=NULL;rtype=rtype->next) {
|
||||||
if (f->options & rtype->flag) {
|
if (f->options & rtype->flag) {
|
||||||
char * filename;
|
char filename[MAX_PATH];
|
||||||
sprintf(buf, "%s/%d-%s.%s", reportpath(), turn, factionid(f), rtype->extension);
|
sprintf(filename, "%s/%d-%s.%s", reportpath(), turn, factionid(f), rtype->extension);
|
||||||
filename = strdup(buf);
|
|
||||||
if (rtype->write(filename, &ctx)==0) {
|
if (rtype->write(filename, &ctx)==0) {
|
||||||
gotit = true;
|
gotit = true;
|
||||||
}
|
}
|
||||||
free(filename);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("Reports for %s: DONE\n", factionname(f));
|
puts(" DONE");
|
||||||
if (!gotit) {
|
if (!gotit) {
|
||||||
log_warning(("No report for faction %s!\n", factionid(f)));
|
log_warning(("No report for faction %s!\n", factionid(f)));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue