summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-03 02:30:57 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-03 02:30:57 +0000
commit834b2b5479723c391ff2dfdb70940da9592b4bce (patch)
tree4fb906fa6ad15b951055465bebd0a9a4d07dc987
parenta9e569676b6f624bd1f24497d52e92b9f38ec366 (diff)
downloadcrawl-ref-834b2b5479723c391ff2dfdb70940da9592b4bce.tar.gz
crawl-ref-834b2b5479723c391ff2dfdb70940da9592b4bce.zip
Attempt to fix oddity when equipping undead when e.g. an orc warrior
dies and leaves its corpse and equipment are on the floor, a ghoul then dies and leaves its equipment on the same spot, and an attempt is then made to animate the dead. With this change, the orc zombie will be properly equipped. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8152 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/spells3.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index ca3c85ca32..552fa11bd4 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -664,9 +664,7 @@ static void _equip_undead(const coord_def &a, int corps, int monster,
{
item_def item(mitm[objl]);
- if (item.base_type == OBJ_CORPSES)
- first_obj = NON_ITEM;
- else if (first_obj == NON_ITEM)
+ if (item.base_type != OBJ_CORPSES && first_obj == NON_ITEM)
first_obj = objl;
objl = item.link;