--- deliantra/server/common/object.C	2007/09/30 20:22:15	1.191
+++ deliantra/server/common/object.C	2007/10/17 19:08:12	1.195
@@ -256,13 +256,14 @@
    */
   if (ob1->inv || ob2->inv)
     {
-      /* if one object has inventory but the other doesn't, not equiv */
-      if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
-        return 0;
+      if (!(ob1->inv && ob2->inv))
+        return 0; /* inventories differ in length */
+
+      if (ob1->inv->below || ob2->inv->below)
+        return 0; /* more than one object in inv */
 
-      /* Now check to see if the two inventory objects could merge */
       if (!object::can_merge (ob1->inv, ob2->inv))
-        return 0;
+        return 0; /* inventory objexts differ */
 
       /* inventory ok - still need to check rest of this object to see
        * if it is valid.
@@ -307,8 +308,17 @@
       ob2->optimise ();
 
       if (ob1->self || ob2->self)
-        if (!cfperl_can_merge (ob1, ob2))
-          return 0;
+        {
+          int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
+          int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
+
+          if (k1 != k2)
+            return 0;
+          else if (k1 == 0)
+            return 1;
+          else if (!cfperl_can_merge (ob1, ob2))
+            return 0;
+        }
     }
 
   /* Everything passes, must be OK. */
@@ -1142,7 +1152,7 @@
   if (!op->nrof)
     return 0;
 
-  if (top)
+  if (!top)
     for (top = op; top && top->above; top = top->above)
       ;