summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monster.cc
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-05 21:48:43 +0300
committerRobert Vollmert <rvollmert@gmx.net>2009-11-05 20:54:38 +0100
commit823bd7c3cb7d42efad29de3d98d3def28aa4c63f (patch)
treee9c572d13b626475a97fbc8aba81cabeb50bcd48 /crawl-ref/source/monster.cc
parent5cae6a4d1a66d74223cf4b6001b234d24be329d9 (diff)
downloadcrawl-ref-823bd7c3cb7d42efad29de3d98d3def28aa4c63f.tar.gz
crawl-ref-823bd7c3cb7d42efad29de3d98d3def28aa4c63f.zip
Replace mons_is_caught with monsters::caught.
Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
Diffstat (limited to 'crawl-ref/source/monster.cc')
-rw-r--r--crawl-ref/source/monster.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index a06fd2e94b..f8ef9febe5 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -1591,7 +1591,7 @@ bool monsters::pickup_missile(item_def &item, int near, bool force)
if (item.sub_type == MI_THROWING_NET)
{
// Monster may not pick up trapping net.
- if (mons_is_caught(this) && item_is_stationary(item))
+ if (this->caught() && item_is_stationary(item))
return (false);
}
else // None of these exceptions hold for throwing nets.
@@ -2782,7 +2782,7 @@ bool monsters::haloed() const
bool monsters::caught() const
{
- return (mons_is_caught(this));
+ return this->has_ench(ENCH_HELD);
}
int monsters::shield_bonus() const