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

Merge pull request #35 from CTD1/Monster_EMail 

Wird schon richtig sein :-)
This commit is contained in:
Enno Rehling 2014-10-16 11:53:45 +02:00
parent 34c80713ad 911b93e343
commit 9c6e380ea0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/kernel/faction.c
View File

@ -126,7 +126,13 @@ faction *get_or_create_monsters(void)
if (!f) { if (!f) {
const race *rc = rc_find("dragon"); const race *rc = rc_find("dragon");
f = addfaction("noreply@eressea.de", NULL, rc, NULL, 0); const char *email = get_param(global.parameters, "monster.email");
if (email) {
f = addfaction(email, NULL, rc, NULL, 0);
}
else {
f = addfaction("noreply@eressea.de", NULL, rc, NULL, 0);
}
renumber_faction(f, 666); renumber_faction(f, 666);
faction_setname(f, "Monster"); faction_setname(f, "Monster");
f->options = 0; f->options = 0;
@ -340,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) {
@ -365,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);