summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monster.cc
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-02 12:13:36 -0600
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-02 12:14:28 -0600
commitdf0f714647e9a25113dff05df58f501a3714f108 (patch)
treecc18239176399a8cce1f6e82da1c9fe7efae1d09 /crawl-ref/source/monster.cc
parent5605a2f60222aed0a04c9728dfa5455373d41c20 (diff)
downloadcrawl-ref-df0f714647e9a25113dff05df58f501a3714f108.tar.gz
crawl-ref-df0f714647e9a25113dff05df58f501a3714f108.zip
Revert "Merge a few bits of Eino's chaotic_experiment branch that make sense"
This reverts commit d50bd43ba9936c27f4f90ecd324d14cb52c9f381.
Diffstat (limited to 'crawl-ref/source/monster.cc')
-rw-r--r--crawl-ref/source/monster.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index ac7cfbecf2..374135686e 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -2784,11 +2784,8 @@ bool monsters::is_chaotic() const
if (mons_is_shapeshifter(this))
return (true);
- if (has_spell(SPELL_POLYMORPH_OTHER)
- || has_spell(SPELL_SUMMON_UGLY_THING))
- {
+ if (has_spell(SPELL_POLYMORPH_OTHER))
return (true);
- }
if (has_attack_flavour(AF_MUTATE)
|| has_attack_flavour(AF_ROT)