From 5aa7d8f5d1121e1d78cf053a20b31d88f9c08260 Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Sat, 30 Nov 2002 21:06:27 +0000
Subject: [PATCH] =?UTF-8?q?-=20Etwas=20=C3=BCbersichtlichere=20Battle-Logs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/kernel/battle.c | 14 +++++++++++++-
 src/common/kernel/battle.h |  1 -
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index a26d9932c..5f6df6153 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -69,6 +69,9 @@ typedef enum combatmagic {
 #include <attributes/otherfaction.h>
 #include <attributes/moved.h>
 
+/* modules includes */
+#include <modules/alliance.h>
+
 /* libc includes */
 #include <assert.h>
 #include <ctype.h>
@@ -2673,6 +2676,15 @@ print_stats(battle * b)
 		buf[77] = (char)0;
 		for (k = buf; *k; ++k) *k = '-';
 		battlerecord(b, buf);
+		if(side->bf->faction) {
+#ifdef ALLIANCES
+			sprintf(buf, "##### %s (%s/%d)", side->bf->faction->name, itoa36(side->bf->faction->no),
+				side->bf->faction->alliance?side->bf->faction->alliance->id:0);
+#else
+			sprintf(buf, "##### %s (%s)", side->bf->faction->name, itoa36(side->bf->faction->no));
+#endif
+			battledebug(buf);
+		}
 		print_fighters(b, &side->fighters);
 	}
 	next(side);
@@ -3058,7 +3070,7 @@ make_battle(region * r)
 #endif
 		if (!bdebug) log_error(("battles können nicht debugged werden\n"));
 		else {
-			dbgprintf((bdebug, "In %s findet ein Kampf statt:", rname(r, NULL)));
+			dbgprintf((bdebug, "In %s findet ein Kampf statt:\n", rname(r, NULL)));
 		}
 		obs_count++;
 	}
diff --git a/src/common/kernel/battle.h b/src/common/kernel/battle.h
index 2c0327b27..1edc29f66 100644
--- a/src/common/kernel/battle.h
+++ b/src/common/kernel/battle.h
@@ -72,7 +72,6 @@ typedef struct side {
 	struct tactics leader;				/* der beste Taktiker des Heeres */
 	struct side * nextF; /* nächstes Heer der gleichen Partei */
 	struct battle * battle;
-	struct faction *faction;	/* Die Partei, die hier kämpft */
 	struct bfaction * bf; /* Die Partei, die hier kämpft */
 	const struct group * group;
 # define E_ENEMY 1