[ViewVC] Diff of: cvs/deliantra/server/random_maps/random

Comparing deliantra/server/random_maps/random_map.h (file contents):
Revision 1.39 by root, Sat Jul 3 01:49:18 2010 UTC vs.
Revision 1.40 by root, Sat Jul 3 02:19:10 2010 UTC

   cell **data;
   int w, h;
   layout (int w, int h);
   layout (layout &copy);
+  layout (layout &orig, int x1, int y1, int x2, int y2); // reference rect in other layout
   ~layout ();
   operator cell **() const
   {
     return data;
   }
   void swap (layout &maze)
   {
     ::swap (maze.data, data);
-    ::swap (maze.w   , w  );
+    ::swap (maze.w   , w   );
-    ::swap (maze.h   , h  );
+    ::swap (maze.h   , h   );
+    ::swap (maze.size, size);
   }
   MTH void swap (layout *maze) { swap (*maze); }
   // for debugging, print maze to stdout
   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:
+  int size;
   void alloc (int w, int h);
 };
 // utility functions, to use rmg_rndm instead of rndm.
 static inline int

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines