--- deliantra/server/random_maps/room_gen_onion.C	2009/11/06 12:49:19	1.18
+++ deliantra/server/random_maps/room_gen_onion.C	2010/03/26 01:04:44	1.22
@@ -1,9 +1,9 @@
 /*
  * 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 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 Affero GNU General Public License as published by the
@@ -52,10 +52,7 @@
 
 #include <global.h>
 #include <random_map.h>
-
-#ifndef MIN
-# define MIN(x,y) (((x)<(y))? (x):(y))
-#endif
+#include <rproto.h>
 
 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);
@@ -115,7 +112,7 @@
 {
   int i, maxlayers;
 
-  maxlayers = (MIN (xsize, ysize) - 2) / 5;
+  maxlayers = (min (xsize, ysize) - 2) / 5;
 
   if (!maxlayers)
     return;                     /* map too small to onionize */
@@ -187,7 +184,7 @@
 {
   int i, maxlayers;
 
-  maxlayers = (MIN (xsize, ysize) - 2) / 5;
+  maxlayers = (min (xsize, ysize) - 2) / 5;
 
   if (!maxlayers)
     return;                     /* map too small to onionize */
@@ -294,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 */
@@ -415,7 +412,7 @@
 {
   int i, maxlayers;
 
-  maxlayers = (MIN (xsize, ysize) - 2) / 5;
+  maxlayers = (min (xsize, ysize) - 2) / 5;
 
   if (!maxlayers)
     return;                     /* map too small to onionize */