Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2017-02-18 22:02:58 +01:00
commit b744b6d601
1 changed files with 3 additions and 0 deletions

View File

@ -1244,6 +1244,9 @@ target_resists_magic(unit * magician, void *obj, int objtyp, int t_bonus)
skill *sv; skill *sv;
unit *u = (unit *)obj; unit *u = (unit *)obj;
if (u_race(u)==get_race(RC_SPELL)) {
return true;
}
at = effskill(magician, SK_MAGIC, 0); at = effskill(magician, SK_MAGIC, 0);
for (sv = u->skills; sv != u->skills + u->skill_size; ++sv) { for (sv = u->skills; sv != u->skills + u->skill_size; ++sv) {