diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-07 21:10:06 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-07 21:10:06 +0000 |
| commit | 3355652704f6c7948671c1e30b0c8e5b0b75290e (patch) | |
| tree | a1e7e97892c7da5a31c84da7b1890f9a38778cb0 /crawl-ref | |
| parent | 04f29ca98900cc98c39856271976854306477297 (diff) | |
| download | crawl-ref-3355652704f6c7948671c1e30b0c8e5b0b75290e.tar.gz crawl-ref-3355652704f6c7948671c1e30b0c8e5b0b75290e.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7181 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/religion.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index f1635c956d..469fa52257 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2010,7 +2010,12 @@ std::string god_prayer_reaction() static bool _god_accepts_prayer(god_type god) { - if (god_protects_from_harm(god, false) == HPT_PRAYING) + harm_protection_type hpt = god_protects_from_harm(god, false); + + if (hpt == HPT_PRAYING || hpt == HPT_PRAYING_PLUS_ANYTIME) + return (true); + + if (god_likes_butchery(god)) return (true); switch (god) @@ -2021,19 +2026,11 @@ static bool _god_accepts_prayer(god_type god) case GOD_YREDELEMNUL: return (yred_injury_mirror(false)); - case GOD_VEHUMET: - case GOD_XOM: - case GOD_SHINING_ONE: - case GOD_SIF_MUNA: - case GOD_KIKUBAAQUDGHA: - case GOD_NO_GOD: - return (false); - default: break; } - return (true); + return (false); } void pray() |