summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohanna Ploog <j-p-e-g@users.sourceforge.net>2010-01-10 00:11:03 +0100
committerJohanna Ploog <j-p-e-g@users.sourceforge.net>2010-01-10 00:11:03 +0100
commit9d79dc038f1d09f3ef9aa375c2c885b987ebb8ef (patch)
tree0a4dbf2cb3e0933a939a9bb6f3858a1eb4d79e4b
parentf1a12d12411a56acebe19a94e3bfbfb655b08548 (diff)
downloadcrawl-ref-9d79dc038f1d09f3ef9aa375c2c885b987ebb8ef.tar.gz
crawl-ref-9d79dc038f1d09f3ef9aa375c2c885b987ebb8ef.zip
Don't annotate fog generator exclusions as monster-triggered.
-rw-r--r--crawl-ref/source/exclude.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/crawl-ref/source/exclude.cc b/crawl-ref/source/exclude.cc
index 0d400a0aa2..f37d08eb0c 100644
--- a/crawl-ref/source/exclude.cc
+++ b/crawl-ref/source/exclude.cc
@@ -465,11 +465,16 @@ void set_exclude(const coord_def &p, int radius, bool autoexcl, bool vaultexcl,
else
{
monster_type montype = MONS_NO_MONSTER;
- const monsters *m = monster_at(p);
- if (m && (you.can_see(m) || mons_is_stationary(m)
- && testbits(m->flags, MF_SEEN)))
+ if (!defer_updates)
{
- montype = m->type;
+ // Don't list a monster in the exclusion annotation if the
+ // exclusion was triggered by e.g. the flamethrowers' lua check.
+ const monsters *m = monster_at(p);
+ if (m && (you.can_see(m) || mons_is_stationary(m)
+ && testbits(m->flags, MF_SEEN)))
+ {
+ montype = m->type;
+ }
}
curr_excludes.add_exclude(p, radius, autoexcl, montype, vaultexcl);