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

- Etwas übersichtlichere Battle-Logs

This commit is contained in:
Christian Schlittchen 2002-11-30 21:06:27 +00:00
parent 5de27cf583
commit 5aa7d8f5d1
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/kernel/battle.c
View File

@ -69,6 +69,9 @@ typedef enum combatmagic {
#include <attributes/otherfaction.h> #include <attributes/otherfaction.h>
#include <attributes/moved.h> #include <attributes/moved.h>
/* modules includes */
#include <modules/alliance.h>
/* libc includes */ /* libc includes */
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
@ -2673,6 +2676,15 @@ print_stats(battle * b)
buf[77] = (char)0; buf[77] = (char)0;
for (k = buf; *k; ++k) *k = '-'; for (k = buf; *k; ++k) *k = '-';
battlerecord(b, buf); 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); print_fighters(b, &side->fighters);
} }
next(side); next(side);
@ -3058,7 +3070,7 @@ make_battle(region * r)
#endif #endif
if (!bdebug) log_error(("battles können nicht debugged werden\n")); if (!bdebug) log_error(("battles können nicht debugged werden\n"));
else { 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++; obs_count++;
} }

1
src/common/kernel/battle.h
View File

@ -72,7 +72,6 @@ typedef struct side {
struct tactics leader; /* der beste Taktiker des Heeres */ struct tactics leader; /* der beste Taktiker des Heeres */
struct side * nextF; /* nächstes Heer der gleichen Partei */ struct side * nextF; /* nächstes Heer der gleichen Partei */
struct battle * battle; struct battle * battle;
struct faction *faction; /* Die Partei, die hier kämpft */
struct bfaction * bf; /* Die Partei, die hier kämpft */ struct bfaction * bf; /* Die Partei, die hier kämpft */
const struct group * group; const struct group * group;
# define E_ENEMY 1 # define E_ENEMY 1