From 6a883aea39bceefb34718c699ee3877d33b6d2ba Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sun, 8 Nov 2009 10:01:11 +0100 Subject: 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. --- crawl-ref/source/player.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'crawl-ref/source/player.cc') 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); -- cgit v1.2.3-54-g00ecf