--- deliantra/server/random_maps/random_map.C 2007/01/19 15:29:52 1.22 +++ deliantra/server/random_maps/random_map.C 2007/01/25 03:54:45 1.26 @@ -61,6 +61,9 @@ char **layout, buf[16384]; int i; + RP->Xsize = RP->xsize; + RP->Ysize = RP->ysize; + /* pick a random seed, or use the one from the input file */ RP->random_seed = RP->random_seed ? RP->random_seed + RP->dungeon_level @@ -95,6 +98,7 @@ if (RP->symmetry_used == SYMMETRY_Y || RP->symmetry_used == SYMMETRY_XY) RP->Ysize = RP->Ysize / 2 + 1; + if (RP->symmetry_used == SYMMETRY_X || RP->symmetry_used == SYMMETRY_XY) RP->Xsize = RP->Xsize / 2 + 1; @@ -154,7 +158,7 @@ make_map_floor (layout, RP->floorstyle, RP); /* set region */ - region = RP->region; + default_region = RP->region; CEDE; @@ -166,7 +170,6 @@ /* place doors unless doorstyle or wallstyle is "none" */ if (strcmp (RP->doorstyle, "none")) put_doors (this, layout, RP->doorstyle, RP); - } CEDE; @@ -643,7 +646,7 @@ { char small_buf[16384]; - sprintf (buf, "xsize %d\nysize %d\n", RP->Xsize, RP->Ysize); + sprintf (buf, "xsize %d\nysize %d\n", RP->xsize, RP->ysize); if (RP->wallstyle[0]) { @@ -794,7 +797,7 @@ if (RP->random_seed) { - sprintf (small_buf, "random_seed %d\n", RP->random_seed); + sprintf (small_buf, "random_seed %u\n", RP->random_seed); strcat (buf, small_buf); } @@ -830,7 +833,7 @@ int difficulty_given_n, int decoroptions_n, int orientation_n, - int origin_x_n, int origin_y_n, int random_seed_n, int treasureoptions_n, float difficulty_increase) + int origin_x_n, int origin_y_n, uint32_t random_seed_n, int treasureoptions_n, float difficulty_increase) { char small_buf[16384]; @@ -976,7 +979,7 @@ if (random_seed_n) { /* Add one so that the next map is a bit different */ - sprintf (small_buf, "random_seed %d\n", random_seed_n + 1); + sprintf (small_buf, "random_seed %u\n", random_seed_n + 1); strcat (buf, small_buf); }