From c0ed53b679f912c7ad0ed4bf232114842249dc1b Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Thu, 17 May 2018 22:15:24 +0200
Subject: [PATCH] last of the duplicate names. battles have lost their
 separators, though.

---
 res/core/messages.xml |  9 +--------
 src/battle.c          | 12 +-----------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/res/core/messages.xml b/res/core/messages.xml
index afc391650..8adc9dfd1 100644
--- a/res/core/messages.xml
+++ b/res/core/messages.xml
@@ -1650,7 +1650,7 @@
     <text locale="de">"$string"</text>
     <text locale="en">"$string"</text>
   </message>
-  <message name="battle_army" section="battle">
+  <message name="battle_army_index" section="battle">
     <type>
       <arg name="index" type="int"/>
       <arg name="name" type="string"/>
@@ -7186,13 +7186,6 @@
     <text locale="en">"Units after the battle:"</text>
   </message>
   
-  <message name="section_battle" section="battle">
-    <type>
-    </type>
-    <text locale="de">""</text>
-    <text locale="en">""</text>
-  </message>
-  
   <message name="sp_wolfhowl_effect" section="battle">
     <type>
       <arg name="mage" type="unit"/>
diff --git a/src/battle.c b/src/battle.c
index b69bab5d6..fa7d70ca5 100644
--- a/src/battle.c
+++ b/src/battle.c
@@ -110,8 +110,6 @@ typedef enum combatmagic {
 static int missile_range[2] = { FIGHT_ROW, BEHIND_ROW };
 static int melee_range[2] = { FIGHT_ROW, FIGHT_ROW };
 
-static message *msg_separator;
-
 const troop no_troop = { 0, 0 };
 
 #define FORMULA_ORIG 0
@@ -2888,9 +2886,7 @@ static void print_stats(battle * b)
             message *msg;
             char buf[1024];
 
-            battle_message_faction(b, f, msg_separator);
-
-            msg = msg_message("battle_army", "index name", army_index(s), sname);
+            msg = msg_message("battle_army_index", "index name", army_index(s), sname);
             battle_message_faction(b, f, msg);
             msg_release(msg);
 
@@ -2959,8 +2955,6 @@ static void print_stats(battle * b)
         print_fighters(b, s);
     }
 
-    message_all(b, msg_separator);
-
     /* Besten Taktiker ermitteln */
 
     b->max_tactics = 0;
@@ -3501,7 +3495,6 @@ static int battle_report(battle * b)
         bool komma = false;
 
         sbs_init(&sbs, buf, sizeof(buf));
-        battle_message_faction(b, fac, msg_separator);
 
         if (cont)
             m = msg_message("lineup_battle", "turn", b->turn);
@@ -4008,9 +4001,6 @@ void do_battle(region * r)
     battle *b = NULL;
     bool fighting = false;
     ship *sh;
-    if (msg_separator == NULL) {
-        msg_separator = msg_message("section_battle", "");
-    }
 
     fighting = start_battle(r, &b);