From 2b0b7cd0f81c00fb83398fdac956c47149cac815 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Mon, 18 Jun 2018 20:33:28 +0200
Subject: [PATCH] BUG 2447: PArtei fehlt im Kampfreport. replace strcpy with
 strcat

---
 src/reports.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/reports.c b/src/reports.c
index 06f6b0084..d240ee86d 100644
--- a/src/reports.c
+++ b/src/reports.c
@@ -2179,10 +2179,10 @@ void report_battle_start(battle * b)
             for (df = s->fighters; df; df = df->next) {
                 if (is_attacker(df)) {
                     if (first) {
-                        sbs_strcpy(&sbs, ", ");
+                        sbs_strcat(&sbs, ", ");
                     }
                     if (lastf) {
-                        sbs_strcpy(&sbs, lastf);
+                        sbs_strcat(&sbs, lastf);
                         first = true;
                     }
                     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, LOC(f->locale, "and"));
             sbs_strcat(&sbs, " ");
-        }
-        if (lastf) {
             sbs_strcat(&sbs, lastf);
         }