--- deliantra/server/common/object.C	2008/12/31 18:07:41	1.276
+++ deliantra/server/common/object.C	2009/02/21 06:25:46	1.283
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -965,7 +965,7 @@
 object::do_destroy ()
 {
   if (flag [FLAG_IS_LINKED])
-    remove_button_link (this);
+    remove_link ();
 
   if (flag [FLAG_FRIENDLY])
     remove_friendly_object (this);
@@ -1299,9 +1299,10 @@
     if (!insert_ob_in_map (more, m, originator, flag))
       return 0;
 
-  CLEAR_FLAG (op, FLAG_REMOVED);
-
+  op->flag [FLAG_REMOVED] = false;
+  op->env = 0;
   op->map = newmap;
+
   mapspace &ms = op->ms ();
 
   /* this has to be done after we translate the coordinates.
@@ -1332,8 +1333,11 @@
         }
 
       if (!originator->is_on_map ())
-        LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
-             op->debug_desc (), originator->debug_desc ());
+        {
+          LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
+               op->debug_desc (), originator->debug_desc ());
+          abort ();
+        }
 
       op->above = originator;
       op->below = originator->below;
@@ -1496,15 +1500,15 @@
  * op is the object to insert it under: supplies x and the map.
  */
 void
-replace_insert_ob_in_map (const char *arch_string, object *op)
+replace_insert_ob_in_map (shstr_tmp archname, object *op)
 {
   /* first search for itself and remove any old instances */
 
   for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
-    if (!strcmp (tmp->arch->archname, arch_string))       /* same archetype */
+    if (tmp->arch->archname == archname)       /* same archetype */
       tmp->destroy ();
 
-  object *tmp = arch_to_object (archetype::find (arch_string));
+  object *tmp = arch_to_object (archetype::find (archname));
 
   tmp->x = op->x;
   tmp->y = op->y;
@@ -2176,7 +2180,7 @@
  * Moved from spell_util.c to object.c with the other related direction
  * functions.
  */
-int reduction_dir[SIZEOFFREE][3] = {
+const int reduction_dir[SIZEOFFREE][3] = {
   {0, 0, 0},                    /* 0 */
   {0, 0, 0},                    /* 1 */
   {0, 0, 0},                    /* 2 */
@@ -2495,7 +2499,7 @@
       // client needs item update to make it work, client bug requires this to be separate
       esrv_update_item (UPD_FLAGS, this, old_container);
 
-      new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
+      new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
       play_sound (sound_find ("chest_close"));
     }
 
@@ -2515,7 +2519,7 @@
         }
 #endif
 
-      new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
+      new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
 
       // make sure the container is available, client bug requires this to be separate
       esrv_send_item (this, new_container);
@@ -2565,21 +2569,24 @@
 }
 
 void
-object::play_sound (faceidx sound)
+object::play_sound (faceidx sound) const
 {
   if (!sound)
     return;
 
-  if (flag [FLAG_REMOVED])
-    return;
-
-  if (env)
-    {
-      if (object *pl = in_player ())
-        pl->contr->play_sound (sound);
-    }
-  else
+  if (is_on_map ())
     map->play_sound (sound, x, y);
+  else if (object *pl = in_player ())
+    pl->contr->play_sound (sound);
+}
+
+void
+object::say_msg (const char *msg) const
+{
+  if (is_on_map ())
+    map->say_msg (msg, x, y);
+  else if (object *pl = in_player ())
+    pl->contr->play_sound (sound);
 }
 
 void