--- deliantra/server/common/object.C	2007/07/16 14:49:01	1.166
+++ deliantra/server/common/object.C	2007/07/26 00:27:07	1.168
@@ -301,14 +301,14 @@
         return 0;
     }
 
-  //TODO: generate an event or call into perl for additional checks
   if (ob1->self || ob2->self)
     {
       ob1->optimise ();
       ob2->optimise ();
 
       if (ob1->self || ob2->self)
-        return 0;
+        if (!cfperl_can_merge (ob1, ob2))
+          return 0;
     }
 
   /* Everything passes, must be OK. */
@@ -2730,4 +2730,9 @@
   insert (force);
 }
 
-
+void
+object::play_sound (faceidx sound) const
+{
+  if (map)
+    map->play_sound (sound, x, y);
+}