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

Merge branch 'develop' of https://github.com/ennorehling/eressea.git

This commit is contained in:
Enno Rehling 2018-06-28 22:49:05 +02:00
parent 5018308170 2b0b7cd0f8
commit e8ef5be7f6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/reports.c
View File

@ -2179,10 +2179,10 @@ void report_battle_start(battle * b)
for (df = s->fighters; df; df = df->next) { for (df = s->fighters; df; df = df->next) {
if (is_attacker(df)) { if (is_attacker(df)) {
if (first) { if (first) {
sbs_strcpy(&sbs, ", "); sbs_strcat(&sbs, ", ");
} }
if (lastf) { if (lastf) {
sbs_strcpy(&sbs, lastf); sbs_strcat(&sbs, lastf);
first = true; first = true;
} }
if (seematrix(f, s)) if (seematrix(f, s))
@ -2193,12 +2193,10 @@ void report_battle_start(battle * b)
} }
} }
} }
if (first) { if (first && lastf) {
sbs_strcat(&sbs, " "); sbs_strcat(&sbs, " ");
sbs_strcat(&sbs, LOC(f->locale, "and")); sbs_strcat(&sbs, LOC(f->locale, "and"));
sbs_strcat(&sbs, " "); sbs_strcat(&sbs, " ");
}
if (lastf) {
sbs_strcat(&sbs, lastf); sbs_strcat(&sbs, lastf);
} }