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 #include +/* modules includes */ +#include + /* libc includes */ #include #include @@ -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