summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-ench.cc
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-06-19 08:54:13 -0400
committerShmuale Mark <shm.mark@gmail.com>2014-06-19 12:09:55 -0400
commit61e7c1565861f7a89ca6f0554d135d64ec55a6fe (patch)
tree5bb02d34013d20e3e95c06b541467729eebf8557 /crawl-ref/source/mon-ench.cc
parentdf118164fecb6f63ba9eee7a6a750bee6b4b940f (diff)
downloadcrawl-ref-61e7c1565861f7a89ca6f0554d135d64ec55a6fe.tar.gz
crawl-ref-61e7c1565861f7a89ca6f0554d135d64ec55a6fe.zip
Try to reduce duplication in Recite code.
is_chaotic() and is_unclean() have been changed to return an int roughly equal to what would have been returned before by the Zin recite function. Some bool flags were added to the function to make it still work right for the other uses (e.g. silver). Prince Ribbit is no longer specially vulnerable to Recite, and insane/ sluggish uniques are unclean rather than chaotic, which seems more consistent with the other uses of the terms. The special case for nonliving and plant monsters to be unrecitable is removed.
Diffstat (limited to 'crawl-ref/source/mon-ench.cc')
-rw-r--r--crawl-ref/source/mon-ench.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-ench.cc b/crawl-ref/source/mon-ench.cc
index d75b3afb8a..15a34ff6ca 100644
--- a/crawl-ref/source/mon-ench.cc
+++ b/crawl-ref/source/mon-ench.cc
@@ -1751,7 +1751,7 @@ void monster::apply_enchantment(const mon_enchant &me)
// This is like Corona, but if silver harms them, it has sticky
// flame levels of damage.
case ENCH_SILVER_CORONA:
- if (is_chaotic())
+ if (chaos())
{
int dam = roll_dice(2, 4) - 1;
simple_monster_message(this, " is seared!");