--- deliantra/server/random_maps/random_map.h	2006/12/31 20:46:17	1.7
+++ deliantra/server/random_maps/random_map.h	2010/03/26 00:59:21	1.22
@@ -1,29 +1,32 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
- *
- * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
- *
- * This program 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 2 of the License, or
- * (at your option) any later version.
- *
+ * 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 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
+ * 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
+ * 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at crossfire@schmorp.de
+ * 
+ * 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>
  */
 
 #ifndef RANDOM_MAP_H
 #define RANDOM_MAP_H
 
+#include "util.h"
+
 struct random_map_params
 {
   char wallstyle[512];
@@ -39,9 +42,9 @@
   char exitstyle[512];
   shstr this_map;
   char exit_on_final_map[512];
+  char *custom;
         
-  int Xsize;
-  int Ysize;
+  int xsize, ysize;
   int expand2x;
   int layoutoptions1;
   int layoutoptions2;
@@ -50,19 +53,25 @@
   int difficulty;
   int difficulty_given;
   float difficulty_increase;
+
   int dungeon_level;
   int dungeon_depth;
+
   int decoroptions;
   int orientation;
   int origin_y;
   int origin_x;
-  int random_seed;
+  uint32_t random_seed;
   uint64_t total_map_hp;
   int map_layout_style;
   int treasureoptions;
   int symmetry_used;
 
   struct region *region;
+
+  // "private", adjusted sizes
+  int Xsize;
+  int Ysize;
 };
 
 enum {
@@ -113,11 +122,79 @@
   SYMMETRY_XY,
 };
 
-#define MIN_RANDOM_MAP_SIZE 10
+// 12 has been experimentally :( determined ot be a lot more stable
+// than 11 or 10, leading to the assumption that something inherently
+// needs a minimum size of at least 12
+#define MIN_RANDOM_MAP_SIZE 12
+
+// reference
+//
+// \0  floor only
+// #   wall
+// D   door
+// <   up
+// >   down
+// C   "center" (of onion layout)
+// .   ?? (rogue)
+//
 
-/*  a macro to get a strongly centered random distribution,
-    from 0 to x, centered at x/2 */
-#define BC_RANDOM(x) ((int) ((RANDOM() % (x)+RANDOM()%(x)+RANDOM()%(x))/3.))
+struct LayoutData : zero_initialised
+{
+  char **col;
+  int w, h;
+
+  LayoutData (int w, int h);
+  ~LayoutData ();
+
+  operator char **()
+  {
+    return col;
+  }
+
+  void clear (char fill = 0);
+  void border (char fill = '#');
+};
+
+struct Layout
+{
+  LayoutData *ptr;
+
+  Layout ()
+  {
+  }
+
+  Layout (int xsize, int ysize)
+  : ptr (new LayoutData (xsize, ysize))
+  {
+  }
+
+  Layout (random_map_params *RP)
+  : ptr (new LayoutData (RP->Xsize, RP->Ysize))
+  {
+  }
+
+  void free ()
+  {
+    delete ptr;
+  }
+
+  LayoutData *operator ->() const
+  {
+    return ptr;
+  }
+
+  operator char **() const
+  {
+    return *ptr;
+  }
+
+  void swap (const Layout &layout) const
+  {
+    ::swap (layout.ptr->col, ptr->col);
+    ::swap (layout.ptr->w  , ptr->w  );
+    ::swap (layout.ptr->h  , ptr->h  );
+  }
+};
 
 #endif