From 28fff31428987bc1279e86275931e0633b2fbafd Mon Sep 17 00:00:00 2001 From: Christian Schlittchen Date: Sat, 11 May 2002 18:22:22 +0000 Subject: [PATCH] - Rassentarnung wird nur noch vererbt, wenn die erschaffene Einheit sich auch Rassentarnen kann. --- src/common/gamecode/spy.c | 2 +- src/common/kernel/eressea.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/gamecode/spy.c b/src/common/gamecode/spy.c index 2b179ca74..ed3abe802 100644 --- a/src/common/gamecode/spy.c +++ b/src/common/gamecode/spy.c @@ -195,7 +195,7 @@ setstealth(unit * u, strlist * S) if (u->race->flags & RCF_SHAPESHIFT) { if (playerrace(trace)) { u->irace = trace; - if (u->race->flags & RCF_SHAPESHIFTANY && get_racename(u->attribs)) + if ((u->race->flags & RCF_SHAPESHIFTANY) && get_racename(u->attribs)) set_racename(&u->attribs, NULL); } } diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index 5b41ded3c..aa6beb713 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -1701,7 +1701,7 @@ create_unit(region * r, faction * f, int number, const struct race *urace, int i /* Daemonentarnung */ set_racename(&u->attribs, get_racename(creator->attribs)); - if (fval(creator->race, RCF_SHAPESHIFT)) { + if (fval(u->race, RCF_SHAPESHIFT) && fval(creator->race, RCF_SHAPESHIFT)) { u->irace = creator->irace; }