summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/misc.cc
diff options
context:
space:
mode:
authorabrahamwl <abrahamwl@gmail.com>2009-10-31 06:16:23 -0700
committerSteven Noonan <steven@uplinklabs.net>2009-10-31 06:29:17 -0700
commit76596a5ea224f9ed96f1282b526a86a32032c547 (patch)
treeedc249c3ea9235b78e1cf405c62579a1e58302a4 /crawl-ref/source/misc.cc
parente232445b8157b09e53b3897acbf9e47183d98a96 (diff)
downloadcrawl-ref-76596a5ea224f9ed96f1282b526a86a32032c547.tar.gz
crawl-ref-76596a5ea224f9ed96f1282b526a86a32032c547.zip
Combine mons_is_submerged(monsters *m) into monsters::submerged()
...and replace all references to mons_is_submerged() with submerged(). It's a dirty job, but someone's got to do it. (Thank God for regex!)
Diffstat (limited to 'crawl-ref/source/misc.cc')
-rw-r--r--crawl-ref/source/misc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 4cdd12829e..b17bbb422f 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2799,7 +2799,7 @@ std::vector<monsters*> get_nearby_monsters(bool want_move,
{
if (mon->alive()
&& (!require_visible || mon->visible_to(&you))
- && !mons_is_submerged(mon)
+ && !mon->submerged()
&& !mons_is_unknown_mimic(mon)
&& (!dangerous_only || !mons_is_safe(mon, want_move,
consider_user_options)))