--- deliantra/server/random_maps/snake.C	2009/11/07 18:32:45	1.11
+++ deliantra/server/random_maps/snake.C	2012/10/29 23:55:54	1.17
@@ -1,28 +1,28 @@
 /*
  * 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)
- * 
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 1994-2004 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.
+snake-type maze.
 
 input:  xsize, ysize;
 output:  a char** array with # and . for closed and open respectively.
@@ -33,19 +33,19 @@
 */
 
 #include <global.h>
-#include "random_map.h"
+#include <rmg.h>
 #include "rproto.h"
 
 void
-make_snake_layout (Layout maze, int options)
+make_snake_layout (layout &maze, int options)
 {
   int i, j;
 
-  maze->clear ();
-  maze->border ();
+  maze.clear ();
+  maze.border ();
 
-  int xsize = maze->w;
-  int ysize = maze->h;
+  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)