summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-behv.cc
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-09 14:57:14 +0300
committerVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-09 14:58:20 +0300
commit2633544c49534e75bdc777f9262789c628a965c4 (patch)
tree1c1e500940dd52d287c59eafbfa6ab2409d271e0 /crawl-ref/source/mon-behv.cc
parent9338556ebf846bbc4176134e3846ef6699e8434b (diff)
downloadcrawl-ref-2633544c49534e75bdc777f9262789c628a965c4.tar.gz
crawl-ref-2633544c49534e75bdc777f9262789c628a965c4.zip
Replace mons_is_pacified with monsters::pacified.
Diffstat (limited to 'crawl-ref/source/mon-behv.cc')
-rw-r--r--crawl-ref/source/mon-behv.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc
index 62cf3b992c..812a796fb7 100644
--- a/crawl-ref/source/mon-behv.cc
+++ b/crawl-ref/source/mon-behv.cc
@@ -1105,7 +1105,7 @@ void handle_behaviour(monsters *mon)
bool isSmart = (mons_intel(mon) > I_ANIMAL);
bool isScared = mon->has_ench(ENCH_FEAR);
bool isMobile = !mons_is_stationary(mon);
- bool isPacified = mons_is_pacified(mon);
+ bool isPacified = mon->pacified();
bool patrolling = mon->is_patrolling();
static std::vector<level_exit> e;
static int e_index = -1;
@@ -1848,7 +1848,7 @@ void behaviour_event(monsters *mon, mon_event_type event, int src,
break;
// Pacified monsters shouldn't change their behaviour.
- if (mons_is_pacified(mon))
+ if (mon->pacified())
break;
// Just set behaviour... foe doesn't change.
@@ -1898,7 +1898,7 @@ void behaviour_event(monsters *mon, mon_event_type event, int src,
const bool wasLurking =
(old_behaviour == BEH_LURK && !mons_is_lurking(mon));
- const bool isPacified = mons_is_pacified(mon);
+ const bool isPacified = mon->pacified();
if ((wasLurking || isPacified)
&& (event == ME_DISTURB || event == ME_ALERT || event == ME_EVAL))