--- deliantra/server/random_maps/exit.C	2006/12/30 10:16:11	1.12
+++ deliantra/server/random_maps/exit.C	2006/12/31 10:28:36	1.14
@@ -30,7 +30,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
-find_in_layout (int mode, char target, int *fx, int *fy, char **layout, RMParms * RP)
+find_in_layout (int mode, char target, int *fx, int *fy, char **layout, random_map_params * RP)
 {
   int M;
   int i, j;
@@ -117,7 +117,7 @@
   6 means southward
 */
 void
-place_exits (maptile *map, char **maze, char *exitstyle, int orientation, RMParms *RP)
+place_exits (maptile *map, char **maze, char *exitstyle, int orientation, random_map_params *RP)
 {
   char styledirname[256];
   maptile *style_map_down = 0;        /* harder maze */
@@ -327,11 +327,9 @@
             /* set the exit down. */
 #endif
             /* load it */
-            if (!(new_map = maptile::find_map (RP->final_map, 0)))
+            if (!(new_map = maptile::load_map_sync (RP->final_map)))
               return;
 
-            new_map->load ();
-
             the_exit_down->slaying = RP->final_map;
 
             for (tmp = new_map->at (new_map->enter_x, new_map->enter_y).bot; tmp; tmp = tmp->above)
@@ -357,8 +355,6 @@
 
                 insert_ob_in_map (the_exit_back, new_map, NULL, 0);
               }
-
-            set_map_timeout (new_map);  /* So it gets swapped out */
           }
         else
           the_exit_down->slaying = "/!";
@@ -376,7 +372,7 @@
    keep things from being dumped on them during the other
    phases of random map generation. */
 void
-unblock_exits (maptile *map, char **maze, RMParms * RP)
+unblock_exits (maptile *map, char **maze, random_map_params * RP)
 {
   int i = 0, j = 0;
   object *walk;