From 1987a585111203eacbe43e591bcfe7ade58e5582 Mon Sep 17 00:00:00 2001 From: Christian Schlittchen Date: Sat, 10 Feb 2001 14:07:29 +0000 Subject: [PATCH] - u_setfaction --- src/common/gamecode/randenc.c | 6 +++--- src/common/triggers/changefaction.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c index 812083013..2156ca850 100644 --- a/src/common/gamecode/randenc.c +++ b/src/common/gamecode/randenc.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: randenc.c,v 1.7 2001/02/10 10:40:10 enno Exp $ + * $Id: randenc.c,v 1.8 2001/02/10 14:07:29 corwin Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -443,7 +443,7 @@ get_allies(region * r, unit * u) break; } - newunit->faction = u->faction; + u_setfaction(newunit, u->faction); if (u->race==RC_DAEMON) newunit->irace=u->irace; if (fval(u, FL_PARTEITARNUNG)) fset(newunit, FL_PARTEITARNUNG); fset(u, FL_ISNEW); @@ -1372,7 +1372,7 @@ randomevents(void) if (rand()%100 < 5) { add_message(&u->faction->msgs, new_message(u->faction, "desertion%u:unit%r:region", u, r)); - u->faction = findfaction(MONSTER_FACTION); + u_setfaction(u, findfaction(MONSTER_FACTION)); } } } diff --git a/src/common/triggers/changefaction.c b/src/common/triggers/changefaction.c index 28852a4ed..bc2631941 100644 --- a/src/common/triggers/changefaction.c +++ b/src/common/triggers/changefaction.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: changefaction.c,v 1.2 2001/01/26 16:19:41 enno Exp $ + * $Id: changefaction.c,v 1.3 2001/02/10 14:07:29 corwin Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -62,7 +62,7 @@ changefaction_handle(trigger * t, void * data) */ changefaction_data * td = (changefaction_data*)t->data.v; if (td->unit && td->faction) { - td->unit->faction = td->faction; + u_setfaction(td->unit, td->faction); } else { fprintf(stderr, "\aERROR: could not perform changefaction::handle()\n"); }