--- deliantra/server/random_maps/square_spiral.C	2006/12/31 19:02:24	1.5
+++ deliantra/server/random_maps/square_spiral.C	2008/04/15 03:00:24	1.14
@@ -1,27 +1,25 @@
-
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    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>
-*/
-
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ * 
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 
+ * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <support@deliantra.net>
+ */
 
 /* peterm@langmuir.eecs.berkeley.edu:  this function generates a random
 snake-type layout.
@@ -34,20 +32,10 @@
 
 */
 
-
-#include <stdio.h>
 #include <global.h>
-#include <time.h>
-
-#include <maze_gen.h>
-#include <room_gen.h>
-#include <random_map.h>
-#include <sproto.h>
-#include <rproto.h>
-
-
-char **map_gen_onion (int xsize, int ysize, int option, int layers);
 
+#include "random_map.h"
+#include "rproto.h"
 
 /* These are some helper functions which help with
    manipulating a centered onion and turning it into
@@ -61,56 +49,59 @@
 void
 find_top_left_corner (char **maze, int *cx, int *cy)
 {
+  --(*cy);
 
-  (*cy)--;
   /* find the top wall. */
   while (maze[*cx][*cy] == 0)
-    (*cy)--;
+    --(*cy);
+
   /* proceed right until a corner is detected */
   while (maze[*cx][*cy + 1] == 0)
-    (*cx)++;
+    ++(*cx);
 
   /* cx and cy should now be the top-right corner of the onion layer */
 }
 
-
-char **
-make_square_spiral_layout (int xsize, int ysize, int options)
+void
+make_square_spiral_layout (Layout maze, int options)
 {
   int i, j;
   int cx, cy;
   int tx, ty;
 
   /* generate and allocate a doorless, centered onion */
-  char **maze = map_gen_onion (xsize, ysize, RMOPT_CENTERED | RMOPT_NO_DOORS, 0);
+  map_gen_onion (maze, RMOPT_CENTERED | RMOPT_NO_DOORS, 0);
+
+  int xsize = maze->w;
+  int ysize = maze->h;
 
   /* find the layout center.  */
   cx = 0;
   cy = 0;
   for (i = 0; i < xsize; i++)
     for (j = 0; j < ysize; j++)
-      {
-        if (maze[i][j] == 'C')
-          {
-            cx = i;
-            cy = j;
-          }
-      }
+      if (maze[i][j] == 'C')
+        {
+          cx = i;
+          cy = j;
+        }
+
   tx = cx;
   ty = cy;
-  while (1)
+  for (;;)
     {
       find_top_left_corner (maze, &tx, &ty);
 
       if (ty < 2 || tx < 2 || tx > xsize - 2 || ty > ysize - 2)
         break;
+
       make_wall (maze, tx, ty - 1, 1);  /* make a vertical wall with a door */
 
       maze[tx][ty - 1] = '#';   /* convert the door that make_wall puts here to a wall */
       maze[tx - 1][ty] = 'D';   /* make a doorway out of this layer */
 
       /* walk left until we find the top-left corner */
-      while ((tx > 2) && maze[tx - 1][ty])
+      while ((tx > 2) && maze[tx - 1, ty])
         tx--;
 
       make_wall (maze, tx - 1, ty, 0);  /* make a horizontal wall with a door */
@@ -131,7 +122,7 @@
 
   /* place the exits.  */
 
-  if (RANDOM () % 2)
+  if (rndm (2))
     {
       maze[cx][cy] = '>';
       maze[xsize - 2][1] = '<';
@@ -141,6 +132,5 @@
       maze[cx][cy] = '<';
       maze[xsize - 2][1] = '>';
     }
-
-  return maze;
 }
+