--- deliantra/server/random_maps/square_spiral.C	2007/11/08 19:43:25	1.11
+++ deliantra/server/random_maps/square_spiral.C	2008/04/15 18:43:11	1.15
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * 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
  * 
@@ -32,74 +32,54 @@
 
 */
 
-
-#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
    a square spiral */
-
-/* this starts from within a centered onion layer (or between two layers),
-   and looks up until it finds a wall, and then looks right until it
-   finds a vertical wall, i.e., the corner.  It sets cx and cy to that.
-   it also starts from cx and cy. */
-
 void
-find_top_left_corner (char **maze, int *cx, int *cy)
-{
-  --(*cy);
-
-  /* find the top wall. */
-  while (maze[*cx][*cy] == 0)
-    --(*cy);
-
-  /* proceed right until a corner is detected */
-  while (maze[*cx][*cy + 1] == 0)
-    ++(*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)
+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++)
+  int cx = 0;
+  int cy = 0;
+  for (int i = 0; i < xsize; i++)
+    for (int j = 0; j < ysize; j++)
       if (maze[i][j] == 'C')
         {
           cx = i;
           cy = j;
+          break;
         }
 
-  tx = cx;
-  ty = cy;
+  int tx = cx;
+  int ty = cy;
   for (;;)
     {
-      find_top_left_corner (maze, &tx, &ty);
+      /* this starts from within a centered onion layer (or between two layers),
+         and looks up until it finds a wall, and then looks right until it
+         finds a vertical wall, i.e., the corner.  It sets tx and ty to that.
+         it also starts from tx and ty. */
+      --ty;
+
+      /* find the top wall. */
+      while (maze[tx][ty] != '#')
+        --ty;
+
+      /* proceed right until a corner is detected */
+      while (maze[tx][ty + 1] != '#')
+        ++tx;
 
+      /* tx and ty should now be the top-right corner of the onion layer */
       if (ty < 2 || tx < 2 || tx > xsize - 2 || ty > ysize - 2)
         break;
 
@@ -109,23 +89,23 @@
       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])
-        tx--;
+      while (tx > 2 && maze[tx - 1][ty])
+        --tx;
 
       make_wall (maze, tx - 1, ty, 0);  /* make a horizontal wall with a door */
 
       /* walk down until we find the bottom-left corner */
-      while (((ty + 1) < ysize) && maze[tx][ty + 1])
-        ty++;
+      while (ty + 1 < ysize && maze[tx][ty + 1])
+        ++ty;
 
       make_wall (maze, tx, ty + 1, 1);  /* make a vertical wall with a door */
 
       /* walk rightuntil we find the bottom-right corner */
-      while (((tx + 1) < xsize) && maze[tx + 1][ty])
-        tx++;
+      while (tx + 1 < xsize && maze[tx + 1][ty])
+        ++tx;
 
       make_wall (maze, tx + 1, ty, 0);  /* make a horizontal wall with a door */
-      tx++;                     /* set up for next layer. */
+      ++tx;                     /* set up for next layer. */
     }
 
   /* place the exits.  */
@@ -140,7 +120,5 @@
       maze[cx][cy] = '<';
       maze[xsize - 2][1] = '>';
     }
-
-  return maze;
 }