--- deliantra/server/common/object.C	2008/05/07 19:19:09	1.241
+++ deliantra/server/common/object.C	2008/05/17 00:17:02	1.243
@@ -188,6 +188,10 @@
       || ob1->name  != ob2->name)
     return 0;
 
+  // some objects are unmergable
+  if (!ob1->nrof || !ob2->nrof)
+    return 0;
+
   /* Do not merge objects if nrof would overflow. First part checks
    * for unsigned overflow (2c), second part checks whether the result
    * would fit into a 32 bit signed int, which is often used to hold
@@ -208,7 +212,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 +223,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 +485,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;
 }
 
 /*
@@ -2419,12 +2424,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)