summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-act.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-act.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-act.cc')
-rw-r--r--crawl-ref/source/mon-act.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index b60dbea05f..dd0036c2f4 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -825,7 +825,7 @@ static bool _handle_scroll(monsters *monster)
if (!monster->has_ench(ENCH_TP))
{
if (monster->caught() || mons_is_fleeing(monster)
- || mons_is_pacified(monster))
+ || monster->pacified())
{
simple_monster_message(monster, " reads a scroll.");
monster_teleport(monster, false);
@@ -837,7 +837,7 @@ static bool _handle_scroll(monsters *monster)
case SCR_BLINKING:
if (monster->caught() || mons_is_fleeing(monster)
- || mons_is_pacified(monster))
+ || monster->pacified())
{
if (mons_near(monster))
{
@@ -1484,7 +1484,7 @@ static bool _handle_throw(monsters *monster, bolt & beem)
// Greatly lowered chances if the monster is fleeing or pacified and
// leaving the level.
- if ((mons_is_fleeing(monster) || mons_is_pacified(monster))
+ if ((mons_is_fleeing(monster) || monster->pacified())
&& !one_chance_in(8))
{
return (false);
@@ -2557,7 +2557,7 @@ static bool _is_trap_safe(const monsters *monster, const coord_def& where,
if (trap.type == TRAP_SHAFT && monster->will_trigger_shaft())
{
if (mons_is_fleeing(monster) && intel >= I_NORMAL
- || mons_is_pacified(monster))
+ || monster->pacified())
{
return (true);
}