--- deliantra/server/random_maps/random_map.h	2008/04/14 22:41:17	1.18
+++ deliantra/server/random_maps/random_map.h	2008/04/15 03:00:24	1.19
@@ -126,13 +126,13 @@
 // needs a minimum size of at least 12
 #define MIN_RANDOM_MAP_SIZE 12
 
-struct MazeData : zero_initialised
+struct LayoutData : zero_initialised
 {
   char **col;
   int w, h;
 
-  MazeData (int w, int h);
-  ~MazeData ();
+  LayoutData (int w, int h);
+  ~LayoutData ();
 
   operator char **()
   {
@@ -143,21 +143,21 @@
   void border (char fill = '#');
 };
 
-struct Maze
+struct Layout
 {
-  MazeData *ptr;
+  LayoutData *ptr;
 
-  Maze ()
+  Layout ()
   {
   }
 
-  Maze (int xsize, int ysize)
-  : ptr (new MazeData (xsize, ysize))
+  Layout (int xsize, int ysize)
+  : ptr (new LayoutData (xsize, ysize))
   {
   }
 
-  Maze (random_map_params *RP)
-  : ptr (new MazeData (RP->Xsize, RP->Ysize))
+  Layout (random_map_params *RP)
+  : ptr (new LayoutData (RP->Xsize, RP->Ysize))
   {
   }
 
@@ -166,7 +166,7 @@
     delete ptr;
   }
 
-  MazeData *operator ->() const
+  LayoutData *operator ->() const
   {
     return ptr;
   }
@@ -176,11 +176,11 @@
     return *ptr;
   }
 
-  void swap (Maze &maze)
+  void swap (const Layout &layout) const
   {
-    MazeData *p = maze.ptr;
-    maze.ptr = ptr;
-    ptr = p;
+    ::swap (layout.ptr->col, ptr->col);
+    ::swap (layout.ptr->w  , ptr->w  );
+    ::swap (layout.ptr->h  , ptr->h  );
   }
 };