--- deliantra/server/common/object.C	2008/05/07 19:19:09	1.241
+++ deliantra/server/common/object.C	2008/07/14 18:36:43	1.247
@@ -208,7 +208,7 @@
   if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
     SET_FLAG (ob2, FLAG_BEEN_APPLIED);
 
-  if (ob1->arch->name      != ob2->arch->name
+  if (ob1->arch->archname  != ob2->arch->archname
       || ob1->name         != ob2->name
       || ob1->title        != ob2->title
       || ob1->msg          != ob2->msg
@@ -219,6 +219,7 @@
       || ob1->skill        != ob2->skill
       || ob1->value        != ob2->value
       || ob1->animation_id != ob2->animation_id
+      || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
       || ob1->client_type  != ob2->client_type
       || ob1->materialname != ob2->materialname
       || ob1->lore         != ob2->lore
@@ -480,13 +481,13 @@
 find_object_name (const char *str)
 {
   shstr_cmp str_ (str);
-  object *op;
 
-  for_all_objects (op)
-    if (op->name == str_)
-      break;
+  if (str_)
+    for_all_objects (op)
+      if (op->name == str_)
+        return op;
 
-  return op;
+  return 0;
 }
 
 /*
@@ -1238,6 +1239,8 @@
 object *
 insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
 {
+  op->remove ();
+
   for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
     {
       tmp->x = x + tmp->arch->x;
@@ -1270,7 +1273,23 @@
 object *
 insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
 {
-  op->remove ();
+  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 ();
+    }
+
+  if (op->face && !face_info (op->face))//D TODO: remove soon
+    {//D
+      LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
+      op->face = 1;//D
+    }//D
 
   /* Ideally, the caller figures this out.  However, it complicates a lot
    * of areas of callers (eg, anything that uses find_free_spot would now
@@ -1524,7 +1543,7 @@
 
   if (nrof)
     {
-      adjust_weight (env, -weight * nr); // carrying == 0
+      adjust_weight (env, -weight * max (1, nr)); // carrying == 0
 
       if (object *pl = visible_to ())
         esrv_update_item (UPD_NROF, pl, this);
@@ -2419,12 +2438,13 @@
   char info2[256 * 4];
   char *p = info;
 
-  p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
+  p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
                  count,
                  uuid.c_str (),
                  &name,
-                 title ? "\",title:\"" : "",
+                 title ? ",title:\"" : "",
                  title ? (const char *)title : "",
+                 title ? "\"" : "",
                  flag_desc (flagdesc, 512), type);
 
   if (!flag[FLAG_REMOVED] && env)