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

Merge pull request #875 from ennorehling/2608-nmrdeath 

Bug 2608: nmr death, gift items
This commit is contained in:
Enno Rehling 2019-09-14 21:52:10 +02:00 committed by GitHub
parent 48297838c7 434aa15b9a
commit f1132ca9f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clibs

@ -1 +1 @@
Subproject commit 1854780fe3073e491775836c22f709668b1fff62 Subproject commit f8969f44de1ec413cfee82b23c9f4b3c32d49b56

5
src/kernel/faction.c
View File

@ -408,9 +408,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);
@ -463,6 +460,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

@ -952,8 +952,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);