From d209dced6edfec770b03610e54a2836fb2bc0f30 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Tue, 10 Nov 2009 21:30:42 -0600 Subject: Properly split up unholy and evil items, reworking is_(unholy|evil)(). This is mainly for Fedhas, who hates the latter but not the former. --- crawl-ref/source/player.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/player.cc') diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 28cac3250c..b3d7218db1 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6382,14 +6382,12 @@ bool player::is_holy() const bool player::is_unholy() const { - const mon_holy_type holi = holiness(); - - return (holi == MH_UNDEAD || holi == MH_DEMONIC); + return (holiness() == MH_DEMONIC); } bool player::is_evil() const { - if (is_unholy()) + if (holiness() == MH_UNDEAD) return (true); if (is_evil_god(religion)) -- cgit v1.2.3-54-g00ecf