--- deliantra/server/random_maps/treasure.C	2007/01/15 01:50:33	1.15
+++ deliantra/server/random_maps/treasure.C	2007/01/15 21:06:19	1.18
@@ -1,27 +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>
+ */
 
 /*  placing treasure in maps, where appropriate.  */
 
@@ -214,6 +213,7 @@
       the_chest->destroy ();
       return NULL;
     }
+
   xl = x + freearr_x[i];
   yl = y + freearr_y[i];
 
@@ -369,7 +369,7 @@
             {
               kx = (RANDOM () % (RP->Xsize - 2)) + 1;
               ky = (RANDOM () % (RP->Ysize - 2)) + 1;
-              freeindex = find_first_free_spot (the_key, map, kx, ky);
+              freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
             }
 
           if (freeindex != -1)
@@ -658,15 +658,19 @@
         }
     }
   /* give up and return the closest free spot. */
-  i = find_first_free_spot (&archetype::find ("chest")->clone, map, x, y);
-  if (i != -1 && i <= SIZEOFFREE1)
+  i = find_free_spot (&archetype::find ("chest")->clone, map, x, y, 1, SIZEOFFREE1 + 1);
+
+  if (i != -1)
     {
       *cx = x + freearr_x[i];
       *cy = y + freearr_y[i];
-      return;
     }
-  /* indicate failure */
-  *cx = *cy = -1;
+  else
+    {
+      /* indicate failure */
+      *cx = -1;
+      *cy = -1;
+    }
 }