diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-10-31 08:16:07 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-10-31 16:57:54 +0100 |
| commit | a57962fa1975ecc27863c2f847fa2a1c4484f7fa (patch) | |
| tree | 7e5055301b3554b4598be94b52b65633fea156dc /crawl-ref/source/mon-movetarget.cc | |
| parent | b5aec581b1ad18e6eefb77947e822c089f778d6f (diff) | |
| download | crawl-ref-a57962fa1975ecc27863c2f847fa2a1c4484f7fa.tar.gz crawl-ref-a57962fa1975ecc27863c2f847fa2a1c4484f7fa.zip | |
monster_near_iterator
Does the "in view" part of functionality of monster_iterator, is simpler,
allows using los models other than LOS_DEFAULT, and gets rid of a lot of
uses of get_los().
The code is nearly identical as actor_near_iterator, but the old delegation
used more code than either of those. Still, perhaps templating could work?
This commit also fixes a buttload of ignoring invis / see invis / sense invis
(ie, visible_to()) and act-through-glass bugs.
Diffstat (limited to 'crawl-ref/source/mon-movetarget.cc')
| -rw-r--r-- | crawl-ref/source/mon-movetarget.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-movetarget.cc b/crawl-ref/source/mon-movetarget.cc index d8003f6bdf..1eade46937 100644 --- a/crawl-ref/source/mon-movetarget.cc +++ b/crawl-ref/source/mon-movetarget.cc @@ -940,7 +940,8 @@ static bool _herd_ok(monster * mon) bool intermediate_range = false; int intermediate_thresh = LOS_RADIUS + HERD_COMFORT_RANGE; - for (monster_iterator mit(mon); mit; ++mit) + // herdlings magically know others even out of LOS + for (monster_iterator mit; mit; ++mit) { if (mit->mindex() == mon->mindex()) continue; |