diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-10 21:30:42 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-10 22:04:09 -0600 |
| commit | d209dced6edfec770b03610e54a2836fb2bc0f30 (patch) | |
| tree | 131c8f4bddb17dad5ab719bfdb7d8f825d52f4d7 /crawl-ref/source/player.cc | |
| parent | 219ce41e6713bcdf4432f977a1fce0c770cee348 (diff) | |
| download | crawl-ref-d209dced6edfec770b03610e54a2836fb2bc0f30.tar.gz crawl-ref-d209dced6edfec770b03610e54a2836fb2bc0f30.zip | |
Properly split up unholy and evil items, reworking is_(unholy|evil)().
This is mainly for Fedhas, who hates the latter but not the former.
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 6 |
1 files changed, 2 insertions, 4 deletions
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)) |