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

Merge branch 'stm2-flee_spell' into develop

This commit is contained in:
Enno Rehling 2021-03-22 21:10:07 +01:00
parent e19bd8bd08 a7d335b83a
commit d38130870a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/spells/combatspells.c
View File

@ -882,7 +882,7 @@ int flee_spell(struct castorder * co, int strength)
return 0; return 0;
} }
fgs = select_fighters(b, fi->side, FS_ENEMY, select_afraid, NULL); fgs = select_fighters(b, fi->side, FS_ENEMY, (co->sp->sptyp & PRECOMBATSPELL) ? select_afraid : select_alive, NULL);
scramble_fighters(fgs); scramble_fighters(fgs);
for (qi = 0, ql = fgs; force > 0 && ql; selist_advance(&ql, &qi, 1)) { for (qi = 0, ql = fgs; force > 0 && ql; selist_advance(&ql, &qi, 1)) {
@ -895,7 +895,7 @@ int flee_spell(struct castorder * co, int strength)
++panik; ++panik;
} }
else if (!(df->person[n].flags & FL_COURAGE) else if (!(df->person[n].flags & FL_COURAGE)
|| !(u_race(df->unit)->flags & RCF_UNDEAD)) { && !(u_race(df->unit)->flags & RCF_UNDEAD)) {
if (!is_magic_resistant(mage, df->unit, 0)) { if (!is_magic_resistant(mage, df->unit, 0)) {
df->person[n].flags |= FL_PANICED; df->person[n].flags |= FL_PANICED;
++panik; ++panik;