--- deliantra/server/random_maps/room_gen_onion.C 2008/05/04 14:12:37 1.16
+++ deliantra/server/random_maps/room_gen_onion.C 2011/04/23 04:56:53 1.26
@@ -1,22 +1,23 @@
/*
* 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
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 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.
+ * 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 GNU General Public License
- * along with this program. If not, see .
+ * 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
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -50,27 +51,25 @@
#include
-#include
+#include
+#include
-#ifndef MIN
-# define MIN(x,y) (((x)<(y))? (x):(y))
-#endif
-void centered_onion (char **maze, int xsize, int ysize, int option, int layers);
-void bottom_centered_onion (char **maze, int xsize, int ysize, int option, int layers);
-void bottom_right_centered_onion (char **maze, int xsize, int ysize, int option, int layers);
+static void centered_onion (char **maze, int xsize, int ysize, int option, int layers);
+static void bottom_centered_onion (char **maze, int xsize, int ysize, int option, int layers);
+static void bottom_right_centered_onion (char **maze, int xsize, int ysize, int option, int layers);
-void draw_onion (char **maze, float *xlocations, float *ylocations, int layers);
-void make_doors (char **maze, float *xlocations, float *ylocations, int layers, int options);
+static void draw_onion (char **maze, float *xlocations, float *ylocations, int layers);
+static void make_doors (char **maze, float *xlocations, float *ylocations, int layers, int options);
void
-map_gen_onion (Layout maze, int option, int layers)
+map_gen_onion (layout &maze, int option, int layers)
{
int i, j;
- int xsize = maze->w;
- int ysize = maze->h;
+ int xsize = maze.w;
+ int ysize = maze.h;
- maze->clear ();
+ maze.clear ();
/* pick some random options if option = 0 */
if (option == 0)
@@ -94,7 +93,7 @@
/* write the outer walls, if appropriate. */
if (!(option & RMOPT_WALL_OFF))
- maze->border ();
+ maze.border ();
if (option & RMOPT_WALLS_ONLY)
return;
@@ -108,12 +107,12 @@
centered_onion (maze, xsize, ysize, option, layers);
}
-void
+static void
centered_onion (char **maze, int xsize, int ysize, int option, int layers)
{
int i, maxlayers;
- maxlayers = (MIN (xsize, ysize) - 2) / 5;
+ maxlayers = (min (xsize, ysize) - 2) / 5;
if (!maxlayers)
return; /* map too small to onionize */
@@ -180,12 +179,12 @@
sfree (ylocations, 2 * layers);
}
-void
+static void
bottom_centered_onion (char **maze, int xsize, int ysize, int option, int layers)
{
int i, maxlayers;
- maxlayers = (MIN (xsize, ysize) - 2) / 5;
+ maxlayers = (min (xsize, ysize) - 2) / 5;
if (!maxlayers)
return; /* map too small to onionize */
@@ -261,8 +260,8 @@
sfree (ylocations, 2 * layers);
}
-/* draw_boxes: draws the lines in the maze defining the onion layers */
-void
+/* draw_boxes: draws the lines in the maze defining the onion layers */
+static void
draw_onion (char **maze, float *xlocations, float *ylocations, int layers)
{
int i, j, l;
@@ -292,7 +291,7 @@
}
}
-void
+static void
make_doors (char **maze, float *xlocations, float *ylocations, int layers, int options)
{
int freedoms; /* number of different walls on which we could place a door */
@@ -408,12 +407,12 @@
maze[x1][y1] = 'C';
}
-void
+static void
bottom_right_centered_onion (char **maze, int xsize, int ysize, int option, int layers)
{
int i, maxlayers;
- maxlayers = (MIN (xsize, ysize) - 2) / 5;
+ maxlayers = (min (xsize, ysize) - 2) / 5;
if (!maxlayers)
return; /* map too small to onionize */