diff --git a/s/build b/s/build index f471229b8..acd338c4a 100755 --- a/s/build +++ b/s/build @@ -35,7 +35,7 @@ git submodule update echo "build eressea" cd $ROOT/$BUILD BRANCH=$(git status -s -b | head -1 | cut -d\ -f 2 | sed 's/\..*//') -if [ "$BRANCH" == "master" ] ; then +if [ "$BRANCH"=="master" ] ; then VERSION=$(git describe --match 'v*.*.*' --tags | sed 's/^v//') cmake -DERESSEA_VERSION="$VERSION" .. else diff --git a/src/magic.c b/src/magic.c index 2299e6523..15dc14307 100644 --- a/src/magic.c +++ b/src/magic.c @@ -1240,6 +1240,9 @@ target_resists_magic(unit * magician, void *obj, int objtyp, int t_bonus) skill *sv; unit *u = (unit *)obj; + if (u_race(u)==get_race(RC_SPELL)) { + return true; + } at = effskill(magician, SK_MAGIC, 0); for (sv = u->skills; sv != u->skills + u->skill_size; ++sv) {