summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-17 21:26:57 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-17 21:26:57 +0000
commit24bbfa46caf3c7972ddac1b8cec577bfd0fa29e0 (patch)
treebeea6f8c3fd95b0629e31bcdbe7f92ea26a53e2b /crawl-ref/source/religion.cc
parent3390e50bf690f56f9ae078b7ff9695e20355f905 (diff)
downloadcrawl-ref-24bbfa46caf3c7972ddac1b8cec577bfd0fa29e0.tar.gz
crawl-ref-24bbfa46caf3c7972ddac1b8cec577bfd0fa29e0.zip
Apply Haran's recent fixes to branch.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6592 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r--crawl-ref/source/religion.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index d0f9d7dee0..7317e0c5f5 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -3091,16 +3091,17 @@ bool god_dislikes_item_handling(const item_def &item)
{
const int item_brand = get_weapon_brand(item);
- if (item_brand == SPWPN_VENOM)
+ if (item_brand == SPWPN_VENOM && item_type_known(item))
return (true);
}
else if (item.base_type == OBJ_MISSILES)
{
const int item_brand = get_ammo_brand(item);
- if (item_brand == SPMSL_POISONED
- || item_brand == SPMSL_POISONED_II
- || item_brand == SPMSL_CURARE)
+ if (item_type_known(item) &&
+ (item_brand == SPMSL_POISONED
+ || item_brand == SPMSL_POISONED_II
+ || item_brand == SPMSL_CURARE))
{
return (true);
}