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

Update faction.c

This commit is contained in:
CTD1 2014-09-25 08:59:29 +02:00
parent f89721ebec
commit 911b93e343
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/faction.c
View File

@ -127,12 +127,10 @@ faction *get_or_create_monsters(void)
const race *rc = rc_find("dragon"); const race *rc = rc_find("dragon");
const char *email = get_param(global.parameters, "monster.email"); const char *email = get_param(global.parameters, "monster.email");
if (email) if (email) {
{
f = addfaction(email, NULL, rc, NULL, 0); f = addfaction(email, NULL, rc, NULL, 0);
} }
else else {
{
f = addfaction("noreply@eressea.de", NULL, rc, NULL, 0); f = addfaction("noreply@eressea.de", NULL, rc, NULL, 0);
} }
renumber_faction(f, 666); renumber_faction(f, 666);
@ -348,7 +346,7 @@ void destroyfaction(faction * f)
if (rc->ec_flags & ECF_REC_HORSES) { /* Zentauren an die Pferde */ if (rc->ec_flags & ECF_REC_HORSES) { /* Zentauren an die Pferde */
h += u->number; h += u->number;
} }
else { /* Orks zählen nur zur Hälfte */ else { /* Orks zählen nur zur Hälfte */
p += (int)(u->number * rc->recruit_multi); p += (int)(u->number * rc->recruit_multi);
} }
for (itm = u->items; itm; itm = itm->next) { for (itm = u->items; itm; itm = itm->next) {
@ -373,7 +371,7 @@ void destroyfaction(faction * f)
group *g; group *g;
ally *sf, *sfn; ally *sf, *sfn;
/* Alle HELFE für die Partei löschen */ /* Alle HELFE für die Partei löschen */
for (sf = ff->allies; sf; sf = sf->next) { for (sf = ff->allies; sf; sf = sf->next) {
if (sf->faction == f) { if (sf->faction == f) {
removelist(&ff->allies, sf); removelist(&ff->allies, sf);