--- deliantra/server/random_maps/floor.C	2006/08/29 08:01:36	1.2
+++ deliantra/server/random_maps/floor.C	2006/09/16 22:24:12	1.6
@@ -1,9 +1,4 @@
 /*
- * static char *rcsid_floor_c =
- *   "$Id: floor.C,v 1.2 2006/08/29 08:01:36 root Exp $";
- */
-
-/*
     CrossFire, A Multiplayer game for X-windows
 
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -23,7 +18,7 @@
     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-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 
@@ -33,31 +28,39 @@
 
 /*  make a map and layout the floor.  */
 
-mapstruct *make_map_floor(char **layout, char *floorstyle,RMParms *RP) {
+maptile *
+make_map_floor (char **layout, char *floorstyle, RMParms * RP)
+{
   char styledirname[256];
   char stylefilepath[256];
-  mapstruct *style_map=0;
+  maptile *style_map = 0;
   object *the_floor;
-  mapstruct *newMap =0; /* (mapstruct *) calloc(sizeof(mapstruct),1); */
-  
+  maptile *newMap = 0;
+
   /* allocate the map */
-  newMap = get_empty_map(RP->Xsize,RP->Ysize);
+  newMap = get_empty_map (RP->Xsize, RP->Ysize);
 
   /* get the style map */
-  sprintf(styledirname,"%s","/styles/floorstyles");
-  sprintf(stylefilepath,"%s/%s",styledirname,floorstyle);
-  style_map = find_style(styledirname,floorstyle,-1);
-  if(style_map == 0) return newMap;
+  sprintf (styledirname, "%s", "/styles/floorstyles");
+  sprintf (stylefilepath, "%s/%s", styledirname, floorstyle);
+  style_map = find_style (styledirname, floorstyle, -1);
+  if (style_map == 0)
+    return newMap;
 
   /* fill up the map with the given floor style */
-  if((the_floor=pick_random_object(style_map))!=NULL) {
-         int i,j;
-         for(i=0;i<RP->Xsize;i++)
-                for(j=0;j<RP->Ysize;j++) {
-                  object *thisfloor=arch_to_object(the_floor->arch);
-                  thisfloor->x = i; thisfloor->y = j;
-                  insert_ob_in_map(thisfloor,newMap,thisfloor,INS_NO_MERGE | INS_NO_WALK_ON);
-                }
-  }
+  if ((the_floor = pick_random_object (style_map)) != NULL)
+    {
+      int i, j;
+
+      for (i = 0; i < RP->Xsize; i++)
+        for (j = 0; j < RP->Ysize; j++)
+          {
+            object *thisfloor = arch_to_object (the_floor->arch);
+
+            thisfloor->x = i;
+            thisfloor->y = j;
+            insert_ob_in_map (thisfloor, newMap, thisfloor, INS_NO_MERGE | INS_NO_WALK_ON);
+          }
+    }
   return newMap;
 }