--- deliantra/server/common/object.C	2008/09/16 16:03:02	1.257
+++ deliantra/server/common/object.C	2008/10/01 16:04:16	1.261
@@ -911,7 +911,7 @@
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
-        inv->destroy (true);
+        inv->destroy ();
     }
   else
     {                       /* Put objects in inventory onto this space */
@@ -925,7 +925,7 @@
               || op->type == TRAP
               || op->flag [FLAG_IS_A_TEMPLATE]
               || op->flag [FLAG_DESTROY_ON_DEATH])
-            op->destroy (true);
+            op->destroy ();
           else
             map->insert (op, x, y);
         }
@@ -999,7 +999,7 @@
 }
 
 void
-object::destroy (bool destroy_inventory)
+object::destroy ()
 {
   if (destroyed ())
     return;
@@ -1007,11 +1007,11 @@
   if (!is_head () && !head->destroyed ())
     {
       LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
-      head->destroy (destroy_inventory);
+      head->destroy ();
       return;
     }
 
-  destroy_inv (!destroy_inventory);
+  destroy_inv (false);
 
   if (is_head ())
     if (sound_destroy)
@@ -1193,7 +1193,7 @@
         op->weight   = 0; // cancel the addition above
         op->carrying = 0; // must be 0 already
 
-        op->destroy (1);
+        op->destroy ();
 
         return top;
       }
@@ -1265,22 +1265,11 @@
 object *
 insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
 {
-  if (op->is_on_map ())
-    {
-      LOG (llevError, "insert_ob_in_map called for object already on map");
-      abort ();
-    }
-
-  if (op->env)
-    {
-      LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
-      op->remove ();
-    }
+  op->remove ();
 
-  if (op->face && !face_info (op->face))//D TODO: remove soon
+  if (m == &freed_map)//D TODO: remove soon
     {//D
-      LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
-      op->face = 1;//D
+      LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
     }//D
 
   /* Ideally, the caller figures this out.  However, it complicates a lot
@@ -1289,7 +1278,7 @@
    */
   if (!xy_normalise (m, op->x, op->y))
     {
-      op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
+      op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
       return 0;
     }
 
@@ -1312,7 +1301,7 @@
           // but some caller surely breaks when we return tmp
           // from here :/
           op->nrof += tmp->nrof;
-          tmp->destroy (1);
+          tmp->destroy ();
         }
 
   CLEAR_FLAG (op, FLAG_APPLIED);        /* hack for fixing F_APPLIED in items of dead people */
@@ -1497,7 +1486,7 @@
 
   for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
     if (!strcmp (tmp->arch->archname, arch_string))       /* same archetype */
-      tmp->destroy (1);
+      tmp->destroy ();
 
   object *tmp = arch_to_object (archetype::find (arch_string));
 
@@ -1630,7 +1619,7 @@
 
           adjust_weight (this, op->total_weight ());
 
-          op->destroy (1);
+          op->destroy ();
           op = tmp;
           goto inserted;
         }