summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-08-16 03:09:01 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-08-16 03:09:01 +0000
commitbbc2c84cd20394123053636d0c10ef93cc959668 (patch)
tree2bf448ef8c2507ecc7f3b82e7ca480b4dc4cf320
parent1a5e43d139dd7a64225addfe0ba79cb59058a959 (diff)
downloadcrawl-ref-bbc2c84cd20394123053636d0c10ef93cc959668.tar.gz
crawl-ref-bbc2c84cd20394123053636d0c10ef93cc959668.zip
Apply trunk r6821 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6822 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/spl-book.cc2
-rw-r--r--crawl-ref/source/spl-cast.cc1
2 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 2a1b9bf5a3..54a509db3a 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -1087,6 +1087,7 @@ bool undead_cannot_memorise(spell_type spell, char being)
case SPELL_RESIST_POISON:
case SPELL_SPIDER_FORM:
case SPELL_STATUE_FORM:
+ case SPELL_STONESKIN:
case SPELL_SYMBOL_OF_TORMENT:
case SPELL_TAME_BEASTS:
return (true);
@@ -1128,6 +1129,7 @@ bool undead_cannot_memorise(spell_type spell, char being)
case SPELL_RESIST_POISON:
case SPELL_SPIDER_FORM:
case SPELL_STATUE_FORM:
+ case SPELL_STONESKIN:
case SPELL_SUMMON_HORRIBLE_THINGS:
case SPELL_SYMBOL_OF_TORMENT:
case SPELL_TAME_BEASTS:
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index adca9c8e4e..2aad6a7cde 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -881,6 +881,7 @@ static bool _vampire_cannot_cast(spell_type spell)
case SPELL_RESIST_POISON:
case SPELL_SPIDER_FORM:
case SPELL_STATUE_FORM:
+ case SPELL_STONESKIN:
case SPELL_TAME_BEASTS:
return (true);
default: