summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monster.cc
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-08 15:57:39 +0300
committerVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-08 15:57:39 +0300
commit5d78f4fbac5120ebee12c73624ded022abc3c933 (patch)
tree3094243a75f6b986c1677a4913e17f1d4eba8dfe /crawl-ref/source/monster.cc
parentd43819dd4146ff9efa63da5bfdfd3995adb37a68 (diff)
downloadcrawl-ref-5d78f4fbac5120ebee12c73624ded022abc3c933.tar.gz
crawl-ref-5d78f4fbac5120ebee12c73624ded022abc3c933.zip
Replace mons_cannot_act with monsters::cannot_act.
Diffstat (limited to 'crawl-ref/source/monster.cc')
-rw-r--r--crawl-ref/source/monster.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index 9327548e89..43dfcb65ce 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -2790,7 +2790,8 @@ bool monsters::paralysed() const
bool monsters::cannot_act() const
{
- return (mons_cannot_act(this));
+ return (paralysed()
+ || petrified() && !petrifying());
}
bool monsters::cannot_move() const
@@ -4595,8 +4596,7 @@ void monsters::apply_enchantment(const mon_enchant &me)
case ENCH_HELD:
{
- if (mons_is_stationary(this) || mons_cannot_act(this)
- || asleep())
+ if (mons_is_stationary(this) || cannot_act() || asleep())
{
break;
}