summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-08 10:01:11 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-08 10:02:38 +0100
commit6a883aea39bceefb34718c699ee3877d33b6d2ba (patch)
tree7dfc750f9da300c069643661ec329b969515c897 /crawl-ref/source/player.cc
parent14710e6fd41d63a20a68342b6604d48de3a6b621 (diff)
downloadcrawl-ref-6a883aea39bceefb34718c699ee3877d33b6d2ba.tar.gz
crawl-ref-6a883aea39bceefb34718c699ee3877d33b6d2ba.zip
Add a general halo interface to actor.
Also convert the TSO halo to use this. actor::haloed() is still specific to the player TSO halo.
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 0c6725c3da..35ff2be90e 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3585,9 +3585,9 @@ void display_char_status()
else
mpr("You are alive.");
- if (you.haloed())
+ const int halo_size = you.halo_radius();
+ if (halo_size > 0)
{
- const int halo_size = halo_radius();
if (halo_size > 6)
mpr("You are illuminated by a large divine halo.");
else if (halo_size > 3)
@@ -6906,11 +6906,6 @@ void player::backlight()
}
}
-bool player::haloed() const
-{
- return (halo_radius());
-}
-
bool player::can_mutate() const
{
return (true);