summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-11 11:51:53 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-11 11:51:53 +0000
commit79a6889bb573ec0dfc937c78ea1259c6ff1aa482 (patch)
treee9a30c17957445978364571b5485909e7052cdcf /crawl-ref/source/effects.cc
parent9d22d5ea6e7ac7a211bc3d9fca2247d0bb0ce3b6 (diff)
downloadcrawl-ref-79a6889bb573ec0dfc937c78ea1259c6ff1aa482.tar.gz
crawl-ref-79a6889bb573ec0dfc937c78ea1259c6ff1aa482.zip
[1804499] Fixed acquirement occasionally mauling unrandarts and producing bad items.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2423 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index ff4de0f7a0..77e3a93bcc 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1439,7 +1439,8 @@ bool acquirement(object_class_type class_wanted, int agent)
}
}
else if (thing.base_type == OBJ_WEAPONS
- && !is_fixed_artefact( thing ))
+ && !is_fixed_artefact( thing )
+ && !is_unrandom_artefact( thing ))
{
// HACK: make unwieldable weapons wieldable
// Note: messing with fixed artefacts is probably very bad.
@@ -1530,7 +1531,8 @@ bool acquirement(object_class_type class_wanted, int agent)
}
else if (thing.base_type == OBJ_ARMOUR
- && !is_fixed_artefact( thing ))
+ && !is_fixed_artefact( thing )
+ && !is_unrandom_artefact( thing ))
{
// HACK: make unwearable hats and boots wearable
// Note: messing with fixed artefacts is probably very bad.