--- deliantra/server/random_maps/exit.C	2006/12/20 09:14:22	1.10
+++ deliantra/server/random_maps/exit.C	2006/12/30 18:45:28	1.13
@@ -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;
@@ -108,11 +108,6 @@
     }
 }
 
-
-
-
-
-
 /* orientation:  0 means random,
   1 means descending dungeon
   2 means ascending dungeon
@@ -121,9 +116,8 @@
   5 means northward
   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 */
@@ -264,8 +258,8 @@
     maze[the_exit_up->x][the_exit_up->y] = '<';
 
     /* set the starting x,y for this map */
-    MAP_ENTER_X (map) = the_exit_up->x;
-    MAP_ENTER_Y (map) = the_exit_up->y;
+    map->enter_x = the_exit_up->x;
+    map->enter_y = the_exit_up->y;
 
     /* first, look for a '>' character */
     find_in_layout (0, '>', &downx, &downy, maze, RP);
@@ -333,13 +327,14 @@
             /* set the exit down. */
 #endif
             /* load it */
-            if ((new_map = ready_map_name (RP->final_map, 0)) == NULL)
+            if (!(new_map = maptile::find_map (RP->final_map, 0)))
               return;
 
+            new_map->load ();
+
             the_exit_down->slaying = RP->final_map;
-            strcpy (new_map->path, RP->final_map);
 
-            for (tmp = GET_MAP_OB (new_map, MAP_ENTER_X (new_map), MAP_ENTER_Y (new_map)); tmp; tmp = tmp->above)
+            for (tmp = new_map->at (new_map->enter_x, new_map->enter_y).bot; tmp; tmp = tmp->above)
               /* Remove exit back to previous random map.  There should only be one
                * which is why we break out.  To try to process more than one
                * would require keeping a 'next' pointer, ad free_object kills tmp, which
@@ -347,7 +342,6 @@
                */
               if (tmp->type == EXIT && EXIT_PATH (tmp) && !strncmp (EXIT_PATH (tmp), "/random/", 8))
                 {
-                  tmp->remove ();
                   tmp->destroy ();
                   break;
                 }
@@ -358,13 +352,11 @@
                 the_exit_back->slaying = map->path;
                 the_exit_back->stats.hp = the_exit_down->x;
                 the_exit_back->stats.sp = the_exit_down->y;
-                the_exit_back->x = MAP_ENTER_X (new_map);
-                the_exit_back->y = MAP_ENTER_Y (new_map);
+                the_exit_back->x = new_map->enter_x;
+                the_exit_back->y = new_map->enter_y;
 
                 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 = "/!";
@@ -378,13 +370,11 @@
 
 }
 
-
-
 /* this function unblocks the exits.  We blocked them to
    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;