diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-09-13 07:13:30 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-09-13 07:13:30 +0200 |
| commit | e5f0be714222620701b36ee5cc7bed69b78eb56d (patch) | |
| tree | f6f152d78b1254ce6ba96d51c9f0d24410a33cb2 /crawl-ref/source/exclude.cc | |
| parent | a2d0eab8a23003d8b096265efd7b4c76303b2dac (diff) | |
| download | crawl-ref-e5f0be714222620701b36ee5cc7bed69b78eb56d.tar.gz crawl-ref-e5f0be714222620701b36ee5cc7bed69b78eb56d.zip | |
Move mons_is_stationary() to struct actor.
Simplifies code in a number of places, and also fixes a few tree-moving bugs.
Diffstat (limited to 'crawl-ref/source/exclude.cc')
| -rw-r--r-- | crawl-ref/source/exclude.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/exclude.cc b/crawl-ref/source/exclude.cc index ca782705a6..cc84b4b6b2 100644 --- a/crawl-ref/source/exclude.cc +++ b/crawl-ref/source/exclude.cc @@ -30,7 +30,7 @@ extern set<pair<string, level_id> > auto_unique_annotations; static bool _mon_needs_auto_exclude(const monster* mon, bool sleepy = false) { - if (mons_is_stationary(mon)) + if (mon->is_stationary()) return !sleepy; // Auto exclusion only makes sense if the monster is still asleep or if it @@ -42,7 +42,7 @@ static bool _mon_needs_auto_exclude(const monster* mon, bool sleepy = false) static bool _need_auto_exclude(const monster* mon, bool sleepy = false) { // This only works if the name is lowercased. - string name = mon->name(DESC_BASENAME, mons_is_stationary(mon) + string name = mon->name(DESC_BASENAME, mon->is_stationary() && testbits(mon->flags, MF_SEEN)); lowercase(name); |