From 4e2a3beaa9f6f4ab3ad89a47c332d727fcefa87d Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 16 Apr 2005 16:59:08 +0000 Subject: [PATCH] =?UTF-8?q?Korrekte=20Meldungen=20=C3=BCber=20fehlerhafte?= =?UTF-8?q?=20Familiars.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/eressea/korrektur.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index d8ce1bb90..8c83031e4 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -965,20 +965,21 @@ check_dissolve(void) static int fix_familiars(void) { + const struct locale * lang = find_locale("en"); region * r; for (r=regions;r;r=r->next) { unit * u; for (u=r->units;u;u=u->next) if (u->faction->no!=MONSTER_FACTION) { - if (u->race->init_familiar) { + if (u->race->init_familiar && u->race->maintenance==0) { /* this is a familiar */ unit * mage = get_familiar_mage(u); if (mage==0) { - log_error(("%s is a %s familiar with no mage for faction %s", - unitid(u), racename(0, u, u->race), + log_error(("%s is a %s familiar with no mage for faction %s\n", + unitid(u), racename(lang, u, u->race), factionid(u->faction))); } else if (!is_mage(mage)) { - log_error(("%s is a %s familiar, but %s is not a mage for faction %s", - unitid(u), racename(0, u, u->race), unitid(mage), + log_error(("%s is a %s familiar, but %s is not a mage for faction %s\n", + unitid(u), racename(lang, u, u->race), unitid(mage), factionid(u->faction))); } }