--- deliantra/server/common/object.C	2007/07/10 07:31:19	1.165
+++ deliantra/server/common/object.C	2007/08/08 04:52:59	1.174
@@ -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. */
@@ -962,6 +962,12 @@
   if (destroy_inventory)
     destroy_inv (false);
 
+  if (is_head ())
+    if (sound_destroy)
+      play_sound (sound_destroy);
+    else if (flag [FLAG_MONSTER])
+      play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
+
   attachable::destroy ();
 }
 
@@ -1091,21 +1097,12 @@
            * being removed.
            */
 
-          if (tmp->type == PLAYER && tmp != this)
-            {
-              /* If a container that the player is currently using somehow gets
-               * removed (most likely destroyed), update the player view
-               * appropriately.
-               */
-              if (tmp->container == this)
-                {
-                  flag [FLAG_APPLIED] = 0;
-                  tmp->container = 0;
-                }
-
-              if (tmp->contr->ns)
-                tmp->contr->ns->floorbox_update ();
-            }
+          if (tmp->type == PLAYER && tmp->container == this)
+            /* If a container that the player is currently using somehow gets
+             * removed (most likely destroyed), update the player view
+             * appropriately.
+             */
+            tmp->close_container ();
 
           /* See if object moving off should effect something */
           if (check_walk_off
@@ -1377,7 +1374,6 @@
                 top = last->below;
             }
         }                       /* If objects on this space */
-
       if (flag & INS_MAP_LOAD)
         top = ms.top;
 
@@ -2731,4 +2727,3 @@
   insert (force);
 }
 
-