--- deliantra/server/random_maps/exit.C	2007/01/11 00:41:08	1.21
+++ deliantra/server/random_maps/exit.C	2007/02/17 23:32:11	1.25
@@ -1,26 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    Copyright (C) 2001 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program 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 2 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at <crossfire@schmorp.de>
-*/
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
+ * Copyright (C) 1992 Frank Tore Johansen
+ * 
+ * This program 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 2 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, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ */
 
 #include <global.h>
 #include <random_map.h>
@@ -40,7 +40,7 @@
 
   /* if a starting point isn't given, pick one */
   if (mode < 1 || mode > 4)
-    M = RANDOM () % 4 + 1;
+    M = rndm (4) + 1;
   else
     M = mode;
 
@@ -135,7 +135,7 @@
       final_map_exit = 0;
 
   if (!orientation)
-    orientation = RANDOM () % 6 + 1;
+    orientation = rndm (6) + 1;
 
   switch (orientation)
     {
@@ -173,7 +173,7 @@
     {
       object *tmp;
 
-      tmp = pick_random_object (style_map_up);
+      tmp = style_map_up->pick_random_object ();
       the_exit_up = arch_to_object (tmp->arch);
     }
 
@@ -186,7 +186,7 @@
       {
         object *tmp;
 
-        tmp = pick_random_object (style_map_down);
+        tmp = style_map_down->pick_random_object ();
         the_exit_down = arch_to_object (tmp->arch);
       }
   else
@@ -306,7 +306,7 @@
       {
         char buf[16384];
 
-        int i = find_first_free_spot (the_exit_down, map, downx, downy);
+        int i = find_free_spot (the_exit_down, map, downx, downy, 1, SIZEOFFREE1 + 1);
         the_exit_down->x = downx + freearr_x[i];
         the_exit_down->y = downy + freearr_y[i];
         RP->origin_x = the_exit_down->x;