From 9b7411676323a17536f65cc4fc2ae95c4ab6514a Mon Sep 17 00:00:00 2001 From: Christian Schlittchen Date: Mon, 18 Feb 2002 21:48:22 +0000 Subject: [PATCH] =?UTF-8?q?-=20Mit=20GIB=200=20an=20Bauern=20gegebene=20D?= =?UTF-8?q?=C3=A4monen=20verschwinden.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/gamecode/report.c | 2 +- src/common/kernel/unit.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index beadbd23c..842ec4f6d 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -3399,7 +3399,7 @@ report_summary(summary * s, summary * o, boolean full) rcomp(s->poprace[i],o->poprace[i])); } } else { - for (i = 0; i < MAXRACES; i++) if (s->poprace[i] && playerrace(new_race[i])) { + for (i = 0; i < MAXRACES; i++) if (s->poprace[i] && playerrace(new_race[i]) && i != RC_TEMPLATE) { fprintf(F, "%20s: %s\n", LOC(default_locale, rc_name(new_race[i], 1)), rcomp(s->poprace[i],o->poprace[i])); } diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c index 5773a0ab4..6c643a975 100644 --- a/src/common/kernel/unit.c +++ b/src/common/kernel/unit.c @@ -828,7 +828,9 @@ transfermen(unit * u, unit * u2, int n) } } else if (r->land) - rsetpeasants(r, rpeasants(r) + n); + if(u->race != new_race[RC_DAEMON]) { + rsetpeasants(r, rpeasants(r) + n); + } } struct building *