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

Comparing deliantra/server/random_maps/layout.C (file contents):
Revision 1.20 by root, Sun Jul 4 00:27:14 2010 UTC vs.
Revision 1.22 by root, Sun Jul 4 20:23:41 2010 UTC

   border ();
   isolation_remover (0);
 }
 static void
-gen_mixed_ (layout &maze, random_map_params *RP, int dir)
+gen_mixed_ (layout &maze, random_map_params *RP)
 {
-  if (maze.w < 20 && maze.h < 20 && !rmg_rndm (3))
+  if (maze.w > maze.h && maze.w > 16)
-    dir = 2; // stop recursion randomly
-  if (dir == 0 && maze.w > 16)
     {
       int m = rmg_rndm (8, maze.w - 8);
-      layout m1 (maze, 0, 0, m     , maze.h); gen_mixed_ (m1, RP, !dir);
+      layout m1 (maze, 0, 0, m     , maze.h); gen_mixed_ (m1, RP);
-      layout m2 (maze, m, 0, maze.w, maze.h); gen_mixed_ (m2, RP, !dir);
+      layout m2 (maze, m, 0, maze.w, maze.h); gen_mixed_ (m2, RP);
     }
-  else if (dir == 1 && maze.h > 16)
+  else if (maze.h > 16)
     {
       int m = rmg_rndm (8, maze.h - 8);
-      layout m1 (maze, 0, 0, maze.w, m     ); gen_mixed_ (m1, RP, !dir);
+      layout m1 (maze, 0, 0, maze.w, m     ); gen_mixed_ (m1, RP);
-      layout m2 (maze, 0, m, maze.w, maze.h); gen_mixed_ (m2, RP, !dir);
+      layout m2 (maze, 0, m, maze.w, maze.h); gen_mixed_ (m2, RP);
     }
   else
     {
       RP->map_layout_style = rmg_rndm (NROFLAYOUTS - 2) + 1;
 // recursive subdivision with random sublayouts
 static void
 gen_mixed (layout &maze, random_map_params *RP)
 {
   random_map_params &rp = *new random_map_params (RP);
-  gen_mixed_ (maze, &rp, rmg_rndm (2));
+  gen_mixed_ (maze, &rp);
   delete &rp;
   maze.border ();
   maze.isolation_remover (0);
 }

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