--- deliantra/server/random_maps/random_map.h	2010/06/30 01:32:57	1.28
+++ deliantra/server/random_maps/random_map.h	2010/07/02 17:18:04	1.36
@@ -96,6 +96,7 @@
   LAYOUT_ROGUELIKE,
   LAYOUT_SNAKE,
   LAYOUT_SQUARE_SPIRAL,
+  LAYOUT_CAVE,
   NROFLAYOUTS,
 };
 
@@ -141,6 +142,9 @@
 // needs a minimum size of at least 12
 #define MIN_RANDOM_MAP_SIZE 12
 
+// we often use signed chars for coordinates (and U8 for distances)
+#define MAX_RANDOM_MAP_SIZE 120
+
 // reference
 //
 // \0  floor only
@@ -148,80 +152,157 @@
 // D   door
 // <   up
 // >   down
-// C   "center" (of onion layout)
+// C   "center" (of onion maze)
 // .   ?? (rogue)
 //
 
-struct LayoutData : zero_initialised
+// use this in new code
+INTERFACE_CLASS(layout)
+struct layout 
 {
-  char **col;
+  typedef char cell;
+
+  cell **data;
   int w, h;
 
-  LayoutData (int w, int h);
-  ~LayoutData ();
+  layout (int w, int h);
+  layout (layout &copy);
+  ~layout ();
+
+  operator cell **() const
+  {
+    return data;
+  }
+
+  void swap (layout &maze)
+  {
+    ::swap (maze.data, data);
+    ::swap (maze.w   , w  );
+    ::swap (maze.h   , h  );
+  }
+
+  MTH void swap (layout *maze) { swap (*maze); }
+
+  // for debugging, print maze to stdout
+  MTH void print () const;
+
+  // simple inpainting
+  MTH void fill (char fill);
+  MTH void clear () { fill (0); }
+  MTH void border (char fill = '#');
+  MTH void rect (int x1, int y1, int x2, int y2, char fill); // x2, y2 exclusive
+
+  MTH void fill_rand (int perc);
+
+  // makes sure all areas are connected. dirty=true carves rounder but also
+  // more walls, dirty=false carves narrow corridors.
+  MTH void isolation_remover (bool dirty = 0);
+
+  // generates a cave, subtype 0 is a rough cave, randomly open or closed
+  MTH void gen_cave (int subtype);
+
+  // helper functions to modify the maze
+  MTH void erode_1_2 (int c1, int c2 = -1, int repeat = 1);
+  MTH void doorify ();
+  MTH void roomify (); // make some rooms in it, works best on onions
+  MTH void expand2x ();
+  MTH void symmetrize (int symmetry);
+  MTH void rotate (int rotation); // rotate by 1=90, 2=180, 3=270 degrees
+
+  void generate (random_map_params *RP);
+private:
+  void alloc (int w, int h);
+};
+
+// utility functions, to use rmg_rndm instead of rndm.
+static inline int
+rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
+{
+  swap (rmg_rndm, rndm);
+  int i = find_free_spot (ob, m, x, y, start, stop);
+  swap (rmg_rndm, rndm);
+  return i;
+}
+
+// a simple point helper struct
+struct point
+{
+  short x;
+  short y;
 
-  operator char **()
+  point ()
   {
-    return col;
   }
 
-  void clear (char fill = 0);
-  void border (char fill = '#');
+  point (int x, int y)
+  : x(x), y(y)
+  {
+  }
 };
 
-struct Layout
+// something like a vector or stack, but without
+// out of bounds checking
+template<typename T>
+struct fixed_stack
 {
-  LayoutData *ptr;
+  T *data;
+  int size;
+  int max;
 
-  Layout ()
+  fixed_stack ()
+  : size (0), data (0)
   {
   }
 
-  Layout (int xsize, int ysize)
-  : ptr (new LayoutData (xsize, ysize))
+  fixed_stack (int max)
+  : size (0), max (max)
   {
+    data = salloc<T> (max);
   }
 
-  Layout (random_map_params *RP)
-  : ptr (new LayoutData (RP->Xsize, RP->Ysize))
+  void reset (int new_max)
   {
+    sfree (data, max);
+    size = 0;
+    max = new_max;
+    data = salloc<T> (max);
   }
 
   void free ()
   {
-    delete ptr;
+    sfree (data, max);
+    data = 0;
   }
 
-  LayoutData *operator ->() const
+  ~fixed_stack ()
   {
-    return ptr;
+    sfree (data, max);
   }
 
-  operator char **() const
+  T &operator[](int idx)
   {
-    return *ptr;
+    return data [idx];
   }
 
-  void swap (const Layout &layout) const
+  void push (T v)
   {
-    ::swap (layout.ptr->col, ptr->col);
-    ::swap (layout.ptr->w  , ptr->w  );
-    ::swap (layout.ptr->h  , ptr->h  );
+    data [size++] = v;
   }
 
-  // for debugging, print layout to stdout
-  void print ();
-};
+  T &pop ()
+  {
+    return data [--size];
+  }
 
-// utility functions, to use rmg_rndm instead of rndm.
-static inline int
-rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
-{
-  swap (rmg_rndm, rndm);
-  int i = find_free_spot (ob, m, x, y, start, stop);
-  swap (rmg_rndm, rndm);
-  return i;
-}
+  T remove (int idx)
+  {
+    T v = data [idx];
+
+    data [idx] = data [--size];
+
+    return v;
+  }
+};
 
 #endif