--- deliantra/server/random_maps/exit.C	2008/09/29 10:32:50	1.32
+++ deliantra/server/random_maps/exit.C	2010/03/26 00:59:21	1.38
@@ -2,21 +2,22 @@
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
  * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -28,7 +29,7 @@
 
 /*  find a character in the layout.  fx and fy are pointers to
     where to find the char.  fx,fy = -1 if not found. */
-void
+static void
 find_in_layout (int mode, char target, int *fx, int *fy, char **layout, random_map_params *RP)
 {
   int M;
@@ -297,7 +298,7 @@
         if (RP->dungeon_level >= RP->dungeon_depth && *RP->final_map)
           {
             maptile *new_map;
-            object *the_exit_back = arch_to_object (the_exit_up->arch);
+            object *the_exit_back = the_exit_up->arch->instance ();
 
             /* load it */
             if (!(new_map = maptile::find_sync (RP->final_map)))
@@ -313,7 +314,7 @@
                * would require keeping a 'next' pointer, ad free_object kills tmp, which
                * breaks the for loop.
                */
-              if (tmp->type == EXIT && EXIT_PATH (tmp) && !strncmp (EXIT_PATH (tmp), "?random/", 8))
+              if (tmp->type == EXIT && EXIT_PATH (tmp).starts_with ("?random/"))
                 {
                   tmp->destroy ();
                   break;
@@ -332,7 +333,7 @@
               }
           }
         else
-          the_exit_down->slaying = "/!";
+          the_exit_down->slaying = shstr_random_map_exit;
 
         /* Block the exit so things don't get dumped on top of it. */
         the_exit_down->move_block = MOVE_ALL;