summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-05 15:34:51 -0600
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-05 15:36:18 -0600
commit361c86ab3c3017c9136cde225058f25e9f96a822 (patch)
treea67508175f1c2a51a3c6260b943d038f40d19168 /crawl-ref/source/player.cc
parentdc3f573c6ef467ddcc4a837ce90ca9df3b502c2e (diff)
downloadcrawl-ref-361c86ab3c3017c9136cde225058f25e9f96a822.tar.gz
crawl-ref-361c86ab3c3017c9136cde225058f25e9f96a822.zip
In is_evil(), mark player followers and monster priests of evil gods.
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 5d00539bc9..e09b774ea6 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -6380,7 +6380,13 @@ mon_holy_type player::holiness() const
bool player::is_evil() const
{
- return (is_unholy());
+ if (is_unholy())
+ return (true);
+
+ if (is_evil_god(religion))
+ return (true);
+
+ return (false);
}
bool player::is_unholy() const