--- deliantra/server/server/move.C	2008/05/16 17:09:38	1.25
+++ deliantra/server/server/move.C	2008/08/26 02:35:05	1.26
@@ -177,18 +177,18 @@
   if (i == -1)
     return 0;                   /* No free spot */
 
-  if (op->head != NULL)
-    op = op->head;
+  op = op->head_ ();
   op->remove ();
-  for (tmp = op; tmp != NULL; tmp = tmp->more)
-    tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->x),
-      tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->y);
 
-  tmp = insert_ob_in_map (op, op->map, originator, 0);
-  if (tmp)
-    return 0;
-  else
-    return 1;
+  for (object *tmp = op; tmp; tmp = tmp->more)
+    {
+      tmp->x = x + freearr_x[i] + (!tmp->arch ? 0 : tmp->arch->x);
+      tmp->y = y + freearr_y[i] + (!tmp->arch ? 0 : tmp->arch->y);
+    }
+
+  op = insert_ob_in_map (op, op->map, originator, 0);
+
+  return !op;
 }
 
 /*