diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-01 12:11:33 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-01 12:11:33 +0000 |
commit | eed564f133ab31498240ee40fe190a33d1983aac (patch) | |
tree | bcde59952e8e963430d193e4a3be9f058d1fea32 /crawl-ref/source/religion.cc | |
parent | c41c9b094a552b13d12d40241dc230ac9083bac2 (diff) | |
download | crawl-ref-eed564f133ab31498240ee40fe190a33d1983aac.tar.gz crawl-ref-eed564f133ab31498240ee40fe190a33d1983aac.zip |
Fix 2034581: menu colour leaking information on !blood and !mutation.
Fix 2034526: inscription with { not working
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6748 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r-- | crawl-ref/source/religion.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index a1ecd1ab1f..2a666be9b3 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3061,10 +3061,10 @@ bool god_dislikes_item_handling(const item_def &item) if (you.religion == GOD_ZIN) { - if (((item.base_type == OBJ_POTIONS - && item.sub_type == POT_MUTATION) - || (item.base_type == OBJ_WANDS - && item.sub_type == WAND_POLYMORPH_OTHER)) + if ((item.base_type == OBJ_POTIONS + && item.sub_type == POT_MUTATION + || item.base_type == OBJ_WANDS + && item.sub_type == WAND_POLYMORPH_OTHER) && item_type_known(item)) { return (true); @@ -3079,21 +3079,23 @@ bool god_dislikes_item_handling(const item_def &item) if (you.religion == GOD_SHINING_ONE) { + if (!item_type_known(item)) + return (false); + if (item.base_type == OBJ_WEAPONS) { const int item_brand = get_weapon_brand(item); - if (item_brand == SPWPN_VENOM && item_type_known(item)) + if (item_brand == SPWPN_VENOM) return (true); } else if (item.base_type == OBJ_MISSILES) { const int item_brand = get_ammo_brand(item); - if (item_type_known(item) && - (item_brand == SPMSL_POISONED - || item_brand == SPMSL_POISONED_II - || item_brand == SPMSL_CURARE)) + if (item_brand == SPMSL_POISONED + || item_brand == SPMSL_POISONED_II + || item_brand == SPMSL_CURARE) { return (true); } |