From 5d78f4fbac5120ebee12c73624ded022abc3c933 Mon Sep 17 00:00:00 2001
From: Vsevolod Kozlov <zaba@thorium.homeunix.org>
Date: Sun, 8 Nov 2009 15:57:39 +0300
Subject: Replace mons_cannot_act with monsters::cannot_act.

---
 crawl-ref/source/attitude-change.cc | 2 +-
 crawl-ref/source/mon-abil.cc        | 2 +-
 crawl-ref/source/mon-act.cc         | 2 +-
 crawl-ref/source/mon-util.cc        | 6 ------
 crawl-ref/source/mon-util.h         | 1 -
 crawl-ref/source/monster.cc         | 6 +++---
 crawl-ref/source/religion.cc        | 2 +-
 7 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'crawl-ref')

diff --git a/crawl-ref/source/attitude-change.cc b/crawl-ref/source/attitude-change.cc
index 77d1c1b5a3..840c86eb89 100644
--- a/crawl-ref/source/attitude-change.cc
+++ b/crawl-ref/source/attitude-change.cc
@@ -694,7 +694,7 @@ bool beogh_followers_abandon_you()
                 if (you.visible_to(monster)
                     && !monster->asleep()
                     && !mons_is_confused(monster)
-                    && !mons_cannot_act(monster))
+                    && !monster->cannot_act())
                 {
                     const int hd = monster->hit_dice;
 
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index 82f49ffbeb..d200148fa2 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -485,7 +485,7 @@ static bool _siren_movement_effect(const monsters *monster)
                 coord_def swapdest;
                 if (mons_wont_attack(mon)
                     && !mons_is_stationary(mon)
-                    && !mons_cannot_act(mon)
+                    && !mon->cannot_act()
                     && !mon->asleep()
                     && swap_check(mon, swapdest, true))
                 {
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index 31e094f37f..cba2447734 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -1762,7 +1762,7 @@ static void _handle_monster_move(monsters *monster)
 
         _monster_regenerate(monster);
 
-        if (mons_cannot_act(monster))
+        if (monster->cannot_act())
         {
             monster->speed_increment -= non_move_energy;
             continue;
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 91f5094636..46583632f9 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1938,12 +1938,6 @@ mon_attitude_type mons_attitude(const monsters *m)
         return ATT_HOSTILE;
 }
 
-bool mons_cannot_act(const monsters *m)
-{
-    return (m->paralysed()
-            || m->petrified() && !m->petrifying());
-}
-
 bool mons_is_confused(const monsters *m, bool class_too)
 {
     return (m->has_ench(ENCH_CONFUSION)
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index f8b499208f..b346c93d99 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -664,7 +664,6 @@ bool invalid_monster_type(monster_type mt);
 bool invalid_monster_index(int i);
 
 bool monster_shover(const monsters *m);
-bool mons_cannot_act(const monsters *m);
 
 bool monster_senior(const monsters *first, const monsters *second,
                     bool fleeing = false);
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;
         }
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 6ddc729804..36fdfa265c 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -5479,7 +5479,7 @@ int get_tension(god_type god, bool count_travelling)
         if (att == ATT_GOOD_NEUTRAL || att == ATT_NEUTRAL)
             continue;
 
-        if (mons_cannot_act(mons) || mons->asleep() || mons_is_fleeing(mons))
+        if (mons->cannot_act() || mons->asleep() || mons_is_fleeing(mons))
             continue;
 
         int exper = exper_value(mons);
-- 
cgit v1.2.3-54-g00ecf