--- deliantra/server/common/object.C	2007/08/01 01:07:42	1.169
+++ deliantra/server/common/object.C	2007/08/10 01:47:52	1.175
@@ -962,7 +962,11 @@
   if (destroy_inventory)
     destroy_inv (false);
 
-  play_sound (sound_die);
+  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 ();
 }
@@ -1087,28 +1091,24 @@
 
       int check_walk_off = !flag [FLAG_NO_APPLY];
 
+      if (object *pl = ms.player ())
+        {
+          if (pl->container == this)
+            /* If a container that the player is currently using somehow gets
+             * removed (most likely destroyed), update the player view
+             * appropriately.
+             */
+            pl->close_container ();
+
+          pl->contr->ns->floorbox_update ();
+        }
+
       for (tmp = ms.bot; tmp; tmp = tmp->above)
         {
           /* No point updating the players look faces if he is the object
            * 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 ();
-            }
-
           /* See if object moving off should effect something */
           if (check_walk_off
               && ((move_type & tmp->move_off)
@@ -1428,8 +1428,7 @@
    */
   if (!(flag & INS_MAP_LOAD))
     if (object *pl = ms.player ())
-      if (pl->contr->ns)
-        pl->contr->ns->floorbox_update ();
+      pl->contr->ns->floorbox_update ();
 
   /* If this object glows, it may affect lighting conditions that are
    * visible to others on this map.  But update_all_los is really
@@ -2732,9 +2731,3 @@
   insert (force);
 }
 
-void
-object::play_sound (faceidx sound) const
-{
-  if (map)
-    map->play_sound (sound, x, y);
-}