Merge branch 'master' into unified_combat_control

Conflicts:
	crawl-ref/source/Makefile.obj
	crawl-ref/source/dbg-scan.cc
	crawl-ref/source/decks.cc
	crawl-ref/source/describe.cc
	crawl-ref/source/directn.cc
	crawl-ref/source/evoke.cc
	crawl-ref/source/fight.cc
	crawl-ref/source/fight.h
	crawl-ref/source/ghost.cc
	crawl-ref/source/ghost.h
	crawl-ref/source/item_use.cc
	crawl-ref/source/items.cc
	crawl-ref/source/map_knowledge.cc
	crawl-ref/source/melee_attack.h
	crawl-ref/source/mon-abil.cc
	crawl-ref/source/mon-act.cc
	crawl-ref/source/mon-stuff.cc
	crawl-ref/source/monster.cc
	crawl-ref/source/monster.h
	crawl-ref/source/player.cc
	crawl-ref/source/player.h
	crawl-ref/source/shopping.cc
	crawl-ref/source/spl-damage.cc
	crawl-ref/source/spl-summoning.cc
	crawl-ref/source/spl-transloc.cc
	crawl-ref/source/stairs.cc
	crawl-ref/source/stuff.cc
	crawl-ref/source/tags.cc
	crawl-ref/source/traps.cc
	crawl-ref/source/xom.cc

1 files changed, 1 insertions, 2 deletions

diff --git a/crawl-ref/source/mon-clone.cc b/crawl-ref/source/mon-clone.cc
index 8e48ae7ead..b4f35aca35 100644
--- a/crawl-ref/source/mon-clone.cc
+++ b/crawl-ref/source/mon-clone.cc
@@ -143,7 +143,6 @@ static void _mons_summon_monster_illusion(monster* caster,
 
 static void _init_player_illusion_properties(monsterentry *me)
 {
-
     me->holiness = you.holiness();
     // [ds] If we're cloning the player, use their base holiness, not
     // the effects of their Necromutation spell. This is important
@@ -315,7 +314,7 @@ int clone_mons(const monster* orig, bool quiet, bool* obvious,
         if (old_index == NON_ITEM)
             continue;
 
-        const int new_index = get_item_slot(0);
+        const int new_index = get_mitm_slot(0);
         if (new_index == NON_ITEM)
         {
             mons->unequip(mitm[old_index], i, 0, true);