diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-01 15:44:57 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-01 15:44:57 +0000 |
| commit | 8f8b5b59f645ca88bf6b821b04a899b8d779ea45 (patch) | |
| tree | 899cdb2a67b76e34fc6680d1d344d339ad12e5f1 /crawl-ref/source | |
| parent | f9cb4e311fbd85359275929621ed1eafc50d0173 (diff) | |
| download | crawl-ref-8f8b5b59f645ca88bf6b821b04a899b8d779ea45.tar.gz crawl-ref-8f8b5b59f645ca88bf6b821b04a899b8d779ea45.zip | |
Add yet more halo-related cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4025 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spells3.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/spells3.h | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index bd92668cb9..570eac4238 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -4229,7 +4229,7 @@ void monsters::remove_enchantment_effect(const mon_enchant &me, bool quiet) case ENCH_BACKLIGHT: // monsters inside a halo don't lose backlight - if (mons_inside_halo(x, y)) + if (inside_halo(x, y)) add_ench(mon_enchant(ENCH_BACKLIGHT, 0, KC_YOU, 10)); else if (!quiet) { diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 3de92fb395..38631956dd 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -1068,11 +1068,6 @@ bool inside_halo(int posx, int posy) return (_inside_circle(posx, posy, halo_radius()) != -1); } -bool mons_inside_halo(int posx, int posy) -{ - return (inside_halo(posx, posy) && mgrd[posx][posy] != NON_MONSTER); -} - void cast_poison_ammo(void) { const int ammo = you.equip[EQ_WEAPON]; diff --git a/crawl-ref/source/spells3.h b/crawl-ref/source/spells3.h index ae486fad89..87ae6b6d5b 100644 --- a/crawl-ref/source/spells3.h +++ b/crawl-ref/source/spells3.h @@ -71,7 +71,6 @@ bool cast_sanctuary(const int power); int halo_radius(void); void manage_halo(void); bool inside_halo(int posx, int posy); -bool mons_inside_halo(int posx, int posy); // updated 24may2000 {dlb} /* *********************************************************************** |