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

factions that idle out gift their stuff to friends

This commit is contained in:
Enno Rehling 2019-09-14 21:51:13 +02:00
parent 3c5105df7c
commit aecd79dab1
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/kernel/faction.c
View File

@ -426,9 +426,6 @@ void destroyfaction(faction ** fp)
f->next = dead_factions; f->next = dead_factions;
dead_factions = f; dead_factions = f;
fset(f, FFL_QUIT);
f->_alive = false;
if (f->spellbook) { if (f->spellbook) {
spellbook_clear(f->spellbook); spellbook_clear(f->spellbook);
free(f->spellbook); free(f->spellbook);
@ -481,6 +478,8 @@ void destroyfaction(faction ** fp)
setalliance(f, NULL); setalliance(f, NULL);
} }
fset(f, FFL_QUIT);
f->_alive = false;
funhash(f); funhash(f);
/* units of other factions that were disguised as this faction /* units of other factions that were disguised as this faction

3
src/spells/combatspells.c
View File

@ -963,8 +963,7 @@ int sp_hero(struct castorder * co)
} }
} }
m = m = msg_message("cast_hero_effect", "mage spell amount", fi->unit, sp, targets);
msg_message("cast_hero_effect", "mage spell amount", fi->unit, sp, targets);
message_all(b, m); message_all(b, m);
msg_release(m); msg_release(m);