diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-10 14:51:33 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-10 14:51:33 +0000 |
| commit | 3680ca92908368402ea6caf2f9066213e3a816fc (patch) | |
| tree | c6f283cd92e79b5f5188add50c60dc0b9859cca6 /crawl-ref/source/religion.cc | |
| parent | 827db876a847287ed21a72fe190baf32b588c196 (diff) | |
| download | crawl-ref-3680ca92908368402ea6caf2f9066213e3a816fc.tar.gz crawl-ref-3680ca92908368402ea6caf2f9066213e3a816fc.zip | |
Apply trunk r6474 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6475 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 21dda6e4e3..644dcee506 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3052,6 +3052,12 @@ bool is_evil_item(const item_def& item) return retval; } +bool good_god_dislikes_item_handling(const item_def &item) +{ + return (is_good_god(you.religion) && is_evil_item(item) + && (is_demonic(item) || item_type_known(item))); +} + bool god_dislikes_item_handling(const item_def &item) { if (you.religion == GOD_TROG) @@ -3101,8 +3107,7 @@ bool god_dislikes_item_handling(const item_def &item) } } - return (is_good_god(you.religion) && is_evil_item(item) - && (is_demonic(item) || item_type_known(item))); + return (false); } // Is the destroyed weapon valuable enough to gain piety by doing so? |