diff options
Diffstat (limited to 'crawl-ref/source/halo.cc')
| -rw-r--r-- | crawl-ref/source/halo.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/halo.cc b/crawl-ref/source/halo.cc index daa80a728c..152756c7e8 100644 --- a/crawl-ref/source/halo.cc +++ b/crawl-ref/source/halo.cc @@ -11,10 +11,10 @@ // TODO: generalize. bool actor::haloed() const { - return (you.inside_halo(pos())); + return (you.halo_contains(pos())); } -bool actor::inside_halo(const coord_def &c) const +bool actor::halo_contains(const coord_def &c) const { int r = halo_radius(); return ((c - pos()).abs() <= r * r && see_cell(c)); @@ -36,15 +36,15 @@ int monsters::halo_radius() const return 0; } -std::list<actor*> inside_halo(const coord_def &c) +std::list<actor*> haloers(const coord_def &c) { - std::list<actor*> haloers; + std::list<actor*> ret; for (radius_iterator ri(c, LOS_RADIUS, false); ri; ++ri) { actor* a = actor_at(*ri); - if (a && a->inside_halo(c)) - haloers.push_back(a); + if (a && a->halo_contains(c)) + ret.push_back(a); } - return (haloers); + return (ret); } |