Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- u_setfaction

This commit is contained in:
Christian Schlittchen 2001-02-10 14:07:29 +00:00
parent 9be5db81bb
commit 1987a58511
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/gamecode/randenc.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* 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 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -443,7 +443,7 @@ get_allies(region * r, unit * u)
break; break;
} }
newunit->faction = u->faction; u_setfaction(newunit, u->faction);
if (u->race==RC_DAEMON) newunit->irace=u->irace; if (u->race==RC_DAEMON) newunit->irace=u->irace;
if (fval(u, FL_PARTEITARNUNG)) fset(newunit, FL_PARTEITARNUNG); if (fval(u, FL_PARTEITARNUNG)) fset(newunit, FL_PARTEITARNUNG);
fset(u, FL_ISNEW); fset(u, FL_ISNEW);
@ -1372,7 +1372,7 @@ randomevents(void)
if (rand()%100 < 5) { if (rand()%100 < 5) {
add_message(&u->faction->msgs, new_message(u->faction, add_message(&u->faction->msgs, new_message(u->faction,
"desertion%u:unit%r:region", u, r)); "desertion%u:unit%r:region", u, r));
u->faction = findfaction(MONSTER_FACTION); u_setfaction(u, findfaction(MONSTER_FACTION));
} }
} }
} }

4
src/common/triggers/changefaction.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* 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 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.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; changefaction_data * td = (changefaction_data*)t->data.v;
if (td->unit && td->faction) { if (td->unit && td->faction) {
td->unit->faction = td->faction; u_setfaction(td->unit, td->faction);
} else { } else {
fprintf(stderr, "\aERROR: could not perform changefaction::handle()\n"); fprintf(stderr, "\aERROR: could not perform changefaction::handle()\n");
} }