--- deliantra/server/common/object.C	2008/12/27 04:15:56	1.273
+++ deliantra/server/common/object.C	2009/01/08 19:23:44	1.280
@@ -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);
@@ -1288,7 +1288,8 @@
    * of areas of callers (eg, anything that uses find_free_spot would now
    * need extra work
    */
-  if (!xy_normalise (m, op->x, op->y))
+  maptile *newmap = m;
+  if (!xy_normalise (newmap, op->x, op->y))
     {
       op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
       return 0;
@@ -1300,7 +1301,7 @@
 
   CLEAR_FLAG (op, FLAG_REMOVED);
 
-  op->map = m;
+  op->map = newmap;
   mapspace &ms = op->ms ();
 
   /* this has to be done after we translate the coordinates.
@@ -1495,15 +1496,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;
@@ -2058,13 +2059,8 @@
 int
 find_dir (maptile *m, int x, int y, object *exclude)
 {
-  int i, max = SIZEOFFREE, mflags;
-
-  sint16 nx, ny;
-  object *tmp;
-  maptile *mp;
-
-  MoveType blocked, move_type;
+  int max = SIZEOFFREE, mflags;
+  MoveType move_type;
 
   if (exclude && exclude->head_ () != exclude)
     {
@@ -2077,33 +2073,25 @@
       move_type = MOVE_ALL;
     }
 
-  for (i = 1; i < max; i++)
+  for (int i = 1; i < max; i++)
     {
-      mp = m;
-      nx = x + freearr_x[i];
-      ny = y + freearr_y[i];
+      mapxy pos (m, x, y);
+      pos.move (i);
 
-      mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
-
-      if (mflags & P_OUT_OF_MAP)
+      if (!pos.normalise ())
         max = maxfree[i];
       else
         {
-          mapspace &ms = mp->at (nx, ny);
+          mapspace &ms = *pos;
 
-          blocked = ms.move_block;
-
-          if ((move_type & blocked) == move_type)
-            max = maxfree[i];
-          else if (mflags & P_IS_ALIVE)
+          if ((move_type & ms.move_block) == move_type)
+            max = maxfree [i];
+          else if (ms.flags () & P_IS_ALIVE)
             {
-              for (tmp = ms.bot; tmp; tmp = tmp->above)
+              for (object *tmp = ms.bot; tmp; tmp = tmp->above)
                 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
                     && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
-                  break;
-
-              if (tmp)
-                return freedir[i];
+                  return freedir [i];
             }
         }
     }
@@ -2188,7 +2176,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 */
@@ -2336,18 +2324,18 @@
   return 0;
 }
 
-const shstr &
-object::kv_get (const shstr &key) const
+shstr_tmp
+object::kv_get (shstr_tmp key) const
 {
   for (key_value *kv = key_values; kv; kv = kv->next)
     if (kv->key == key)
       return kv->value;
 
-  return shstr_null;
+  return shstr ();
 }
 
 void
-object::kv_set (const shstr &key, const shstr &value)
+object::kv_set (shstr_tmp key, shstr_tmp value)
 {
   for (key_value *kv = key_values; kv; kv = kv->next)
     if (kv->key == key)
@@ -2366,7 +2354,7 @@
 }
 
 void
-object::kv_del (const shstr &key)
+object::kv_del (shstr_tmp key)
 {
   for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
     if ((*kvp)->key == key)
@@ -2545,7 +2533,7 @@
 }
 
 object *
-object::force_find (const shstr name)
+object::force_find (shstr_tmp name)
 {
   /* cycle through his inventory to look for the MARK we want to 
    * place 
@@ -2558,7 +2546,7 @@
 }
 
 object *
-object::force_add (const shstr name, int duration)
+object::force_add (shstr_tmp name, int duration)
 {
   if (object *force = force_find (name))
     force->destroy ();
@@ -2577,21 +2565,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