Make the position of monster held items (-2, -2) rather than (0, 0), so that

any valid item in mitm[] which is still at (0, 0) by the time debug_item_scan()
is called must be buggy.  Also set the link fields of monster held items to
NON_ITEM + 1 + monster_index, so that it's easy to tell which monster is
holding any given item; this is used in debug_mons_scan() and
monsters::pickup() to do some sanity checking of monster inventory.  I've tried
to thoroughly test this, but there might still be some bugs left.

Breaks savefile compatibility (or, rather, will lead to endless error messages
if you use an old save file).


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8322 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 5 deletions

diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 46b10f6558..20a478ccd1 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -813,11 +813,8 @@ void equip_undead(const coord_def &a, int corps, int monster, int monnum)
         if (mon->inv[mslot] != NON_ITEM)
             return;
 
-        unlink_item(objl);
-        mon->inv[mslot] = objl;
-
-        if (mslot != MSLOT_ALT_WEAPON || mons_wields_two_weapons(mon))
-            mon->equip(item, mslot, 0);
+        unwind_var<int> save_speedinc(mon->speed_increment);
+        mon->pickup_item(mitm[objl], false, true);
     } // while
 }