--- deliantra/server/common/object.C	2007/05/17 21:11:42	1.154
+++ deliantra/server/common/object.C	2007/05/17 21:32:08	1.155
@@ -1238,7 +1238,7 @@
 {
   assert (!op->flag [FLAG_FREED]);
 
-  object *tmp, *top, *floor = NULL;
+  object *top, *floor = NULL;
 
   op->remove ();
 
@@ -1264,15 +1264,8 @@
     }
 
   if (object *more = op->more)
-    {
-      if (!insert_ob_in_map (more, m, originator, flag))
-        {
-          if (!op->head)
-            LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
-
-          return 0;
-        }
-    }
+    if (!insert_ob_in_map (more, m, originator, flag))
+      return 0;
 
   CLEAR_FLAG (op, FLAG_REMOVED);
 
@@ -1289,7 +1282,7 @@
   /* this has to be done after we translate the coordinates.
    */
   if (op->nrof && !(flag & INS_NO_MERGE))
-    for (tmp = ms.bot; tmp; tmp = tmp->above)
+    for (object *tmp = ms.bot; tmp; tmp = tmp->above)
       if (object::can_merge (op, tmp))
         {
           op->nrof += tmp->nrof;
@@ -1468,7 +1461,7 @@
    */
 
   /* if this is not the head or flag has been passed, don't check walk on status */
-  if (!(flag & INS_NO_WALK_ON) && !op->head)
+  if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
     {
       if (check_move_on (op, originator))
         return 0;
@@ -1476,7 +1469,7 @@
       /* If we are a multi part object, lets work our way through the check
        * walk on's.
        */
-      for (tmp = op->more; tmp != NULL; tmp = tmp->more)
+      for (object *tmp = op->more; tmp; tmp = tmp->more)
         if (check_move_on (tmp, originator))
           return 0;
     }
@@ -2134,7 +2127,7 @@
 
   MoveType blocked, move_type;
 
-  if (exclude && exclude->head)
+  if (exclude && exclude->head_ () != exclude)
     {
       exclude = exclude->head;
       move_type = exclude->move_type;
@@ -2167,7 +2160,7 @@
             {
               for (tmp = ms.bot; tmp; tmp = tmp->above)
                 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
-                    && (tmp != exclude || (tmp->head && tmp->head != exclude)))
+                    && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
                   break;
 
               if (tmp)
@@ -2372,17 +2365,15 @@
 object *
 object_create_clone (object *asrc)
 {
-  object *dst = 0, *tmp, *src, *part, *prev, *item;
+  object *dst = 0, *tmp, *src, *prev, *item;
 
   if (!asrc)
     return 0;
 
-  src = asrc;
-  if (src->head)
-    src = src->head;
+  src = asrc->head_ ();
 
   prev = 0;
-  for (part = src; part; part = part->more)
+  for (object *part = src; part; part = part->more)
     {
       tmp = part->clone ();
       tmp->x -= src->x;