summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-15 12:27:57 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-15 12:27:57 +0000
commitafaae93d272eb3a6b09fde538c8d85005cad91e3 (patch)
tree7fd2d99a850657c9bda925d27f9b2c6deedaaef5 /crawl-ref/source/effects.cc
parentfb0ab9913b253f6648b2848e7432f29f4b1f2d9f (diff)
downloadcrawl-ref-afaae93d272eb3a6b09fde538c8d85005cad91e3.tar.gz
crawl-ref-afaae93d272eb3a6b09fde538c8d85005cad91e3.zip
[1813214] Trog should not gift the Wrath of Trog.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2472 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 5b8761cd37..7fd88fac32 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1355,9 +1355,13 @@ bool acquirement(object_class_type class_wanted, int agent)
if ((doodad.base_type == OBJ_WEAPONS
&& !can_wield(&doodad, false, true))
|| (doodad.base_type == OBJ_ARMOUR
- && !can_wear_armour(doodad, false, true)))
+ && !can_wear_armour(doodad, false, true))
+
+ // Trog does not gift the Wrath of Trog.
+ || (agent == GOD_TROG && is_fixed_artefact(doodad)
+ && doodad.special == SPWPN_WRATH_OF_TROG))
{
- destroy_item(thing_created);
+ destroy_item(thing_created, true);
thing_created = NON_ITEM;
continue;
}