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

Comparing deliantra/server/random_maps/room_gen_onion.C (file contents):
Revision 1.13 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.14 by root, Mon Apr 14 22:41:17 2008 UTC

 void bottom_right_centered_onion (char **maze, int xsize, int ysize, int option, int layers);
 void draw_onion (char **maze, float *xlocations, float *ylocations, int layers);
 void make_doors (char **maze, float *xlocations, float *ylocations, int layers, int options);
-Maze
+void
-map_gen_onion (int xsize, int ysize, int option, int layers)
+map_gen_onion (Maze maze, int option, int layers)
 {
   int i, j;
-  Maze maze (xsize, ysize);
+  int xsize = maze->w;
+  int ysize = maze->h;
+  maze->clear ();
   /* pick some random options if option = 0 */
   if (option == 0)
     {
       switch (rndm (3))
       if (rndm (2)) option |= RMOPT_IRR_SPACE;
     }
   /* write the outer walls, if appropriate. */
   if (!(option & RMOPT_WALL_OFF))
-    {
+    maze->border ();
-      for (i = 0; i < xsize; i++) maze[i][0] = maze[i][ysize - 1] = '#';
-      for (j = 0; j < ysize; j++) maze[0][j] = maze[xsize - 1][j] = '#';
-    };
   if (option & RMOPT_WALLS_ONLY)
-    return maze;
+    return;
   /* pick off the mutually exclusive options */
   if (option & RMOPT_BOTTOM_R)
     bottom_right_centered_onion (maze, xsize, ysize, option, layers);
   else if (option & RMOPT_BOTTOM_C)
     bottom_centered_onion (maze, xsize, ysize, option, layers);
   else if (option & RMOPT_CENTERED)
     centered_onion (maze, xsize, ysize, option, layers);
-  return maze;
 }
 void
 centered_onion (char **maze, int xsize, int ysize, int option, int layers)
 {

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