--- deliantra/server/random_maps/snake.C	2008/04/11 21:09:53	1.7
+++ deliantra/server/random_maps/snake.C	2010/07/01 01:22:44	1.12
@@ -1,3 +1,25 @@
+/*
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ * 
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) Crossfire Development Team (restored, original file without copyright notice)
+ * 
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero 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 Affero GNU General Public License
+ * and 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.
@@ -14,27 +36,27 @@
 #include "random_map.h"
 #include "rproto.h"
 
-Maze
-make_snake_layout (int xsize, int ysize, int options)
+void
+make_snake_layout (Layout &maze, int options)
 {
   int i, j;
 
-  Maze maze (xsize, ysize);
+  maze.clear ();
+  maze.border ();
 
-  /* write the outer walls */
-  for (i = 0; i < xsize; i++) maze[i][0] = maze[i][ysize - 1] = '#';
-  for (j = 0; j < ysize; j++) maze[0][j] = maze[xsize - 1][j] = '#';
+  int xsize = maze.w;
+  int ysize = maze.h;
 
   /* Bail out if the size is too small to make a snake. */
   if (xsize < 8 || ysize < 8)
-    return maze;
+    return;
 
   /* decide snake orientation--vertical or horizontal , and
      make the walls and place the doors. */
 
-  if (rndm (2))
+  if (rmg_rndm (2))
     {                           /* vertical orientation */
-      int n_walls = rndm (xsize - 5) / 3 + 1;
+      int n_walls = rmg_rndm (xsize - 5) / 3 + 1;
       int spacing = xsize / (n_walls + 1);
       int orientation = 1;
 
@@ -60,7 +82,7 @@
     }
   else
     {                           /* horizontal orientation */
-      int n_walls = rndm (ysize - 5) / 3 + 1;
+      int n_walls = rmg_rndm (ysize - 5) / 3 + 1;
       int spacing = ysize / (n_walls + 1);
       int orientation = 1;
 
@@ -86,7 +108,7 @@
     }
 
   /* place the exit up/down */
-  if (rndm (2))
+  if (rmg_rndm (2))
     {
       maze[1][1] = '<';
       maze[xsize - 2][ysize - 2] = '>';
@@ -96,7 +118,5 @@
       maze[1][1] = '>';
       maze[xsize - 2][ysize - 2] = '<';
     }
-
-  return maze;
 }