[2758242] Fixing segfault during debug_mons_scan due to an mprf not matching its format string with its var args. Also, fixing clone function from chaos brand that was causing this where cloned items in monster inventories weren't setting their link to be part of the new monster's inventory. Refactoring monster holding functions into item_def, where they probably should be.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 488babbb43..72edbf9402 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -302,7 +302,7 @@ void maybe_coagulate_blood_potions_floor(int obj)
     // Coagulated blood cannot coagulate any further...
     ASSERT(blood.sub_type == POT_BLOOD);
 
-    if (!held_by_monster(blood))
+    if (!blood.held_by_monster())
     {
         // Now that coagulating is necessary, check square for
         // !coagulated blood.
@@ -392,8 +392,8 @@ void maybe_coagulate_blood_potions_floor(int obj)
     ASSERT(timer_new.size() == coag_count);
     props_new.assert_validity();
 
-    if (held_by_monster(blood))
-        move_item_to_grid(&o, holding_monster(blood)->pos());
+    if (blood.held_by_monster())
+        move_item_to_grid(&o, blood.holding_monster()->pos());
     else
         move_item_to_grid(&o, blood.pos);