diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-11 11:59:12 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-11 11:59:12 +0000 |
| commit | a9c3df8b7a44ac9c1d80f94562450747bd276ad6 (patch) | |
| tree | ffceba9abd7d926cfa4c3c853c6acc33841919fe | |
| parent | 155111d4667f790c57341e0ae7a1ed0e15613bb5 (diff) | |
| download | crawl-ref-a9c3df8b7a44ac9c1d80f94562450747bd276ad6.tar.gz crawl-ref-a9c3df8b7a44ac9c1d80f94562450747bd276ad6.zip | |
Trunk->0.3 merge: bad item acquirement fix.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2424 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/effects.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index bacb9c6c07..5356f4f59d 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1251,7 +1251,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. @@ -1342,7 +1343,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. |