--- deliantra/server/random_maps/exit.C	2006/12/20 09:14:22	1.10
+++ deliantra/server/random_maps/exit.C	2006/12/25 14:54:44	1.11
@@ -264,8 +264,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);
@@ -339,7 +339,7 @@
             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 = GET_MAP_OB (new_map, new_map->enter_x, new_map->enter_y); 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
@@ -358,8 +358,8 @@
                 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);
               }