diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index 357e396d3..65b0f99e6 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -158,16 +158,18 @@ static char * sidename(side * s) { #define SIDENAMEBUFLEN 256 - static char sidename_buf[SIDENAMEBUFLEN]; + static int bufno; + static char sidename_buf[4][SIDENAMEBUFLEN]; + bufno = bufno % 4; if (s->stealthfaction) { - snprintf(sidename_buf, SIDENAMEBUFLEN, + snprintf(sidename_buf[bufno], SIDENAMEBUFLEN, "%s", factionname(s->stealthfaction)); } else { - snprintf(sidename_buf, SIDENAMEBUFLEN, + snprintf(sidename_buf[bufno], SIDENAMEBUFLEN, "%s", factionname(s->faction)); } - return sidename_buf; + return sidename_buf[bufno++]; } static const char * diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index 523e02eec..22b0545f9 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -1250,7 +1250,7 @@ count_all(const faction * f) } } if (f->num_people != n) { - log_error(("Anzahl Personen für (%s) ist != num_people: %d statt %d.\n", + log_error(("# of people in %s is != num_people: %d should be %d.\n", factionid(f), f->num_people, n)); return n; } diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c index b3a29abd3..bc62b953b 100644 --- a/src/common/kernel/save.c +++ b/src/common/kernel/save.c @@ -517,7 +517,7 @@ factionorders(void) f = findfaction(fid); - if (f!=NULL) { + if (f!=NULL && f->no!=MONSTER_FACTION) { const char * pass = getstrtoken(); if (quiet==0) { log_stdio(stdout, " %4s;", factionid(f));