summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-28 03:15:38 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-28 03:15:38 +0000
commitf086209f1e223b89cb392fd71bdebe2f3551f1f7 (patch)
tree355e0527443d1cd3c8522fd14d913f07c70a9b7d
parentc99d6848f032c11e8b4a5117a80e464770896fb5 (diff)
downloadcrawl-ref-f086209f1e223b89cb392fd71bdebe2f3551f1f7.tar.gz
crawl-ref-f086209f1e223b89cb392fd71bdebe2f3551f1f7.zip
Apply trunk r10440 to 0.5.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10441 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/randart.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc
index fc5007140b..e790d565cd 100644
--- a/crawl-ref/source/randart.cc
+++ b/crawl-ref/source/randart.cc
@@ -117,6 +117,7 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item,
else if (is_good_god(which_god)
&& (brand == SPWPN_DRAINING || brand == SPWPN_PAIN
|| brand == SPWPN_VAMPIRICISM
+ || is_demonic(item)
|| randart_wpn_property(item, RAP_CURSED) != 0))
{
return (false);
@@ -178,6 +179,7 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item,
if (randart_wpn_property(item, RAP_MAGICAL_POWER))
return (false);
+ break;
default:
break;