summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/artefact.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-28 03:14:18 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-28 03:14:18 +0000
commit102ecc248252562f59d7b7baf445cd5cdb2e3162 (patch)
treef48dad7897e27c3c7fce5083980d0d676c581a22 /crawl-ref/source/artefact.cc
parentae187c5a9666e8a87dfdad5ae6ef9cc586b159e4 (diff)
downloadcrawl-ref-102ecc248252562f59d7b7baf445cd5cdb2e3162.tar.gz
crawl-ref-102ecc248252562f59d7b7baf445cd5cdb2e3162.zip
Ensure that no demonic artefacts are named after good gods.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10440 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/artefact.cc')
-rw-r--r--crawl-ref/source/artefact.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index 7ad0a94b53..f0f097e69b 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -120,6 +120,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)
|| artefact_wpn_property(item, ARTP_CURSED) != 0))
{
return (false);
@@ -181,6 +182,7 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item,
if (artefact_wpn_property(item, ARTP_MAGICAL_POWER))
return (false);
+ break;
default:
break;