--- deliantra/server/random_maps/random_map.C 2007/04/17 10:06:34 1.29 +++ deliantra/server/random_maps/random_map.C 2010/06/29 17:22:27 1.54 @@ -1,488 +1,176 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2001 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2001 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992 Frank Tore Johansen * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * Deliantra is free software: you can redistribute it and/or modify it under + * the terms of the Affero GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * The authors can be reached via e-mail at + * You should have received a copy of the Affero GNU General Public License + * and the GNU General Public License along with this program. If not, see + * . + * + * The authors can be reached via e-mail to */ #include #include #include -#include -#include #include #include #include -#define CEDE coroapi::cede_to_tick (); rndm.seed (RP->random_seed + __LINE__); +#define CEDE coroapi::cede_to_tick () -void -dump_layout (char **layout, random_map_params *RP) +static void symmetrize_layout (Layout maze, random_map_params *RP); +static void rotate_layout (Layout maze, int rotation); + +const_utf8_string +random_map_params::get_str (const_utf8_string option, const_utf8_string fallback) const { - { - int i, j; + SV **he = hv_fetch (hv, option, strlen (option), 0); - for (i = 0; i < RP->Xsize; i++) - { - for (j = 0; j < RP->Ysize; j++) - { - if (layout[i][j] == 0) - layout[i][j] = ' '; - printf ("%c", layout[i][j]); - if (layout[i][j] == ' ') - layout[i][j] = 0; - } - printf ("\n"); - } - } - printf ("\n"); + return he ? cfSvPVutf8_nolen (*he) : fallback; } -bool -maptile::generate_random_map (random_map_params *RP) +IV +random_map_params::get_iv (const char *option, IV fallback) const { - char **layout, buf[16384]; - int i; - - RP->Xsize = RP->xsize; - RP->Ysize = RP->ysize; + SV **he = hv_fetch (hv, option, strlen (option), 0); - /* pick a random seed, or use the one from the input file */ - RP->random_seed = RP->random_seed - ? RP->random_seed + RP->dungeon_level - : time (0); - CEDE; - - write_map_parameters_to_string (buf, RP); - - if (RP->difficulty == 0) - { - RP->difficulty = RP->dungeon_level; /* use this instead of a map difficulty */ - - if (RP->difficulty_increase > 0.001) - RP->difficulty = (int) ((float) RP->dungeon_level * RP->difficulty_increase); - - if (RP->difficulty < 1) - RP->difficulty = 1; - } - else - RP->difficulty_given = 1; - - if (RP->Xsize < MIN_RANDOM_MAP_SIZE) - RP->Xsize = MIN_RANDOM_MAP_SIZE + rndm (25) + 5; - - if (RP->Ysize < MIN_RANDOM_MAP_SIZE) - RP->Ysize = MIN_RANDOM_MAP_SIZE + rndm (25) + 5; - - if (RP->symmetry == SYMMETRY_RANDOM) - RP->symmetry_used = rndm (SYMMETRY_XY) + 1; - else - RP->symmetry_used = RP->symmetry; - - 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; - - if (RP->expand2x > 0) - { - RP->Xsize /= 2; - RP->Ysize /= 2; - } - - RP->map_layout_style = LAYOUT_NONE; - - /* Redo this - there was a lot of redundant code of checking for preset - * layout style and then random layout style. Instead, figure out - * the numeric layoutstyle, so there is only one area that actually - * calls the code to make the maps. - */ - if (strstr (RP->layoutstyle, "onion")) - RP->map_layout_style = LAYOUT_ONION; - - if (strstr (RP->layoutstyle, "maze")) - RP->map_layout_style = LAYOUT_MAZE; - - if (strstr (RP->layoutstyle, "spiral")) - RP->map_layout_style = LAYOUT_SPIRAL; - - if (strstr (RP->layoutstyle, "rogue")) - RP->map_layout_style = LAYOUT_ROGUELIKE; - - if (strstr (RP->layoutstyle, "snake")) - RP->map_layout_style = LAYOUT_SNAKE; - - if (strstr (RP->layoutstyle, "squarespiral")) - RP->map_layout_style = LAYOUT_SQUARE_SPIRAL; - - /* No style found - choose one randomly */ - if (RP->map_layout_style == LAYOUT_NONE) - RP->map_layout_style = rndm (NROFLAYOUTS - 1) + 1; - - layout = layoutgen (RP); - -#ifdef RMAP_DEBUG - dump_layout (layout, RP); -#endif - - /* increment these for the current map */ - RP->dungeon_level += 1; - /* allow constant-difficulty maps. */ - /* difficulty+=1; */ - - /* rotate the layout randomly */ - layout = rotate_layout (layout, rndm (4), RP); -#ifdef RMAP_DEBUG - dump_layout (layout, RP); -#endif - - /* allocate the map and set the floor */ - make_map_floor (layout, RP->floorstyle, RP); - - /* set region */ - default_region = RP->region; + return he ? SvIV (*he) : fallback; +} - CEDE; +random_map_params::~random_map_params () +{ + SvREFCNT_dec (hv); +} - /* create walls unless the wallstyle is "none" */ - if (strcmp (RP->wallstyle, "none")) +void +Layout::print () +{ + for (int j = 0; j < ptr->h; j++) { - make_map_walls (this, layout, RP->wallstyle, RP); + for (int i = 0; i < ptr->w; i++) + putc (ptr->col[i][j] ? ptr->col[i][j] : ' ', stdout); - /* place doors unless doorstyle or wallstyle is "none" */ - if (strcmp (RP->doorstyle, "none")) - put_doors (this, layout, RP->doorstyle, RP); + putc ('\n', stdout); } - CEDE; - - /* create exits unless the exitstyle is "none" */ - if (strcmp (RP->exitstyle, "none")) - place_exits (this, layout, RP->exitstyle, RP->orientation, RP); - - CEDE; - - place_specials_in_map (this, layout, RP); - - CEDE; - - /* create monsters unless the monsterstyle is "none" */ - if (strcmp (RP->monsterstyle, "none")) - place_monsters (this, RP->monsterstyle, RP->difficulty, RP); - - CEDE; - - /* treasures needs to have a proper difficulty set for the map. */ - difficulty = estimate_difficulty (); - - CEDE; - - /* create treasure unless the treasurestyle is "none" */ - if (strcmp (RP->treasurestyle, "none")) - place_treasure (this, layout, RP->treasurestyle, RP->treasureoptions, RP); - - CEDE; - - /* create decor unless the decorstyle is "none" */ - if (strcmp (RP->decorstyle, "none")) - put_decor (this, layout, RP->decorstyle, RP->decoroptions, RP); - - CEDE; - - /* generate treasures, etc. */ - fix_auto_apply (); - - CEDE; - - unblock_exits (this, layout, RP); - - /* free the layout */ - for (i = 0; i < RP->Xsize; i++) - free (layout[i]); - - free (layout); - - msg = strdup (buf); - in_memory = MAP_IN_MEMORY; - - CEDE; - - return 1; + putc ('\n', stdout); } -/* function selects the layout function and gives it whatever - arguments it needs. */ -char ** -layoutgen (random_map_params *RP) +/* takes a map and makes it symmetric: adjusts Xsize and + * Ysize to produce a symmetric map. + */ +static void +symmetrize_layout (Layout layout, random_map_params *RP) { - char **maze = 0; - int oxsize = RP->Xsize, oysize = RP->Ysize; - - switch (RP->map_layout_style) - { - case LAYOUT_ONION: - maze = map_gen_onion (RP->Xsize, RP->Ysize, RP->layoutoptions1, RP->layoutoptions2); - if (!(rndm (3)) && !(RP->layoutoptions1 & RMOPT_WALLS_ONLY)) - roomify_layout (maze, RP); - break; - - case LAYOUT_MAZE: - maze = maze_gen (RP->Xsize, RP->Ysize, rndm (2)); - if (!(rndm (2))) - doorify_layout (maze, RP); - break; - - case LAYOUT_SPIRAL: - maze = map_gen_spiral (RP->Xsize, RP->Ysize, RP->layoutoptions1); - if (!(rndm (2))) - doorify_layout (maze, RP); - break; - - case LAYOUT_ROGUELIKE: - /* Don't put symmetry in rogue maps. There isn't much reason to - * do so in the first place (doesn't make it any more interesting), - * but more importantly, the symmetry code presumes we are symmetrizing - * spirals, or maps with lots of passages - making a symmetric rogue - * map fails because its likely that the passages the symmetry process - * creates may not connect the rooms. - */ - RP->symmetry_used = SYMMETRY_NONE; - RP->Ysize = oysize; - RP->Xsize = oxsize; - maze = roguelike_layout_gen (RP->Xsize, RP->Ysize, RP->layoutoptions1); - /* no doorifying... done already */ - break; - - case LAYOUT_SNAKE: - maze = make_snake_layout (RP->Xsize, RP->Ysize, RP->layoutoptions1); - if (rndm (2)) - roomify_layout (maze, RP); - break; - - case LAYOUT_SQUARE_SPIRAL: - maze = make_square_spiral_layout (RP->Xsize, RP->Ysize, RP->layoutoptions1); - if (rndm (2)) - roomify_layout (maze, RP); - break; - } + if (RP->symmetry_used == SYMMETRY_NONE) + return; - maze = symmetrize_layout (maze, RP->symmetry_used, RP); + Layout sym_layout ( + RP->symmetry_used == SYMMETRY_X || RP->symmetry_used == SYMMETRY_XY ? layout->w * 2 - 3 : layout->w, + RP->symmetry_used == SYMMETRY_Y || RP->symmetry_used == SYMMETRY_XY ? layout->h * 2 - 3 : layout->h + ); -#ifdef RMAP_DEBUG - dump_layout (maze, RP); -#endif + if (RP->symmetry_used == SYMMETRY_X) + for (int i = 0; i < sym_layout->w / 2 + 1; i++) + for (int j = 0; j < sym_layout->h; j++) + { + sym_layout[i ][j] = + sym_layout[sym_layout->w - i - 1][j] = layout[i][j]; + } - if (RP->expand2x) - { - maze = expand2x (maze, RP->Xsize, RP->Ysize); - RP->Xsize = RP->Xsize * 2 - 1; - RP->Ysize = RP->Ysize * 2 - 1; - } + if (RP->symmetry_used == SYMMETRY_Y) + for (int i = 0; i < sym_layout->w; i++) + for (int j = 0; j < sym_layout->h / 2 + 1; j++) + { + sym_layout[i][j ] = + sym_layout[i][sym_layout->h - j - 1] = layout[i][j]; + } - return maze; -} + if (RP->symmetry_used == SYMMETRY_XY) + for (int i = 0; i < sym_layout->w / 2 + 1; i++) + for (int j = 0; j < sym_layout->h / 2 + 1; j++) + { + sym_layout[i ][j ] = + sym_layout[i ][sym_layout->h - j - 1] = + sym_layout[sym_layout->w - i - 1][j ] = + sym_layout[sym_layout->w - i - 1][sym_layout->h - j - 1] = layout[i][j]; + } -/* takes a map and makes it symmetric: adjusts Xsize and -Ysize to produce a symmetric map. */ -char ** -symmetrize_layout (char **maze, int sym, random_map_params *RP) -{ - int i, j; - char **sym_maze; - int Xsize_orig, Ysize_orig; + layout.swap (sym_layout); + sym_layout.free (); - Xsize_orig = RP->Xsize; - Ysize_orig = RP->Ysize; - RP->symmetry_used = sym; /* tell everyone else what sort of symmetry is used. */ - if (sym == SYMMETRY_NONE) - { - RP->Xsize = Xsize_orig; - RP->Ysize = Ysize_orig; - return maze; - } - /* pick new sizes */ - RP->Xsize = ((sym == SYMMETRY_X || sym == SYMMETRY_XY) ? RP->Xsize * 2 - 3 : RP->Xsize); - RP->Ysize = ((sym == SYMMETRY_Y || sym == SYMMETRY_XY) ? RP->Ysize * 2 - 3 : RP->Ysize); - - sym_maze = (char **) calloc (sizeof (char *), RP->Xsize); - for (i = 0; i < RP->Xsize; i++) - sym_maze[i] = (char *) calloc (sizeof (char), RP->Ysize); - - if (sym == SYMMETRY_X) - for (i = 0; i < RP->Xsize / 2 + 1; i++) - for (j = 0; j < RP->Ysize; j++) - { - sym_maze[i][j] = maze[i][j]; - sym_maze[RP->Xsize - i - 1][j] = maze[i][j]; - }; - if (sym == SYMMETRY_Y) - for (i = 0; i < RP->Xsize; i++) - for (j = 0; j < RP->Ysize / 2 + 1; j++) - { - sym_maze[i][j] = maze[i][j]; - sym_maze[i][RP->Ysize - j - 1] = maze[i][j]; - } - if (sym == SYMMETRY_XY) - for (i = 0; i < RP->Xsize / 2 + 1; i++) - for (j = 0; j < RP->Ysize / 2 + 1; j++) - { - sym_maze[i][j] = maze[i][j]; - sym_maze[i][RP->Ysize - j - 1] = maze[i][j]; - sym_maze[RP->Xsize - i - 1][j] = maze[i][j]; - sym_maze[RP->Xsize - i - 1][RP->Ysize - j - 1] = maze[i][j]; - } - /* delete the old maze */ - for (i = 0; i < Xsize_orig; i++) - free (maze[i]); - free (maze); /* reconnect disjointed spirals */ - if (RP->map_layout_style == LAYOUT_SPIRAL) - connect_spirals (RP->Xsize, RP->Ysize, sym, sym_maze); - /* reconnect disjointed nethackmazes: the routine for + /* reconnect disjointed nethacklayouts: the routine for spirals will do the trick? */ - if (RP->map_layout_style == LAYOUT_ROGUELIKE) - connect_spirals (RP->Xsize, RP->Ysize, sym, sym_maze); - - return sym_maze; + if (RP->map_layout_style == LAYOUT_SPIRAL + || RP->map_layout_style == LAYOUT_ROGUELIKE) + connect_spirals (layout->w, layout->h, RP->symmetry_used, layout); } - /* takes a map and rotates it. This completes the onion layouts, making them possibly centered on any wall. It'll modify Xsize and Ysize if they're swapped. */ - -char ** -rotate_layout (char **maze, int rotation, random_map_params *RP) +static void +rotate_layout (Layout layout, int rotation) { - char **new_maze; - int i, j; + int w = layout->w; + int h = layout->h; switch (rotation) { - case 0: - return maze; - break; case 2: /* a reflection */ { - char *newmaze = (char *) malloc (sizeof (char) * RP->Xsize * RP->Ysize); + Layout new_layout (w, h); - for (i = 0; i < RP->Xsize; i++) - { /* make a copy */ - for (j = 0; j < RP->Ysize; j++) - { - newmaze[i * RP->Ysize + j] = maze[i][j]; - } - } - for (i = 0; i < RP->Xsize; i++) - { /* copy a reflection back */ - for (j = 0; j < RP->Ysize; j++) - { - maze[i][j] = newmaze[(RP->Xsize - i - 1) * RP->Ysize + RP->Ysize - j - 1]; - } - } - free (newmaze); - return maze; - break; + for (int i = 0; i < w; i++) /* copy a reflection back */ + for (int j = 0; j < h; j++) + new_layout[i][j] = layout[w - i - 1][h - j - 1]; + + layout.swap (new_layout); + new_layout.free (); } + break; + case 1: case 3: { - int swap; - new_maze = (char **) calloc (sizeof (char *), RP->Ysize); - for (i = 0; i < RP->Ysize; i++) - { - new_maze[i] = (char *) calloc (sizeof (char), RP->Xsize); - } - if (rotation == 1) /* swap x and y */ - for (i = 0; i < RP->Xsize; i++) - for (j = 0; j < RP->Ysize; j++) - new_maze[j][i] = maze[i][j]; - - if (rotation == 3) - { /* swap x and y */ - for (i = 0; i < RP->Xsize; i++) - for (j = 0; j < RP->Ysize; j++) - new_maze[j][i] = maze[RP->Xsize - i - 1][RP->Ysize - j - 1]; - } - - /* delete the old layout */ - for (i = 0; i < RP->Xsize; i++) - free (maze[i]); - free (maze); - - swap = RP->Ysize; - RP->Ysize = RP->Xsize; - RP->Xsize = swap; - return new_maze; - break; - } - } - return NULL; -} - -/* take a layout and make some rooms in it. - --works best on onions.*/ -void -roomify_layout (char **maze, random_map_params *RP) -{ - int tries = RP->Xsize * RP->Ysize / 30; - int ti; - - for (ti = 0; ti < tries; ti++) - { - int dx, dy; /* starting location for looking at creating a door */ - int cx, cy; /* results of checking on creating walls. */ - - dx = rndm (RP->Xsize); - dy = rndm (RP->Ysize); - - cx = can_make_wall (maze, dx, dy, 0, RP); /* horizontal */ - cy = can_make_wall (maze, dx, dy, 1, RP); /* vertical */ - if (cx == -1) - { - if (cy != -1) - make_wall (maze, dx, dy, 1); + Layout new_layout (h, w); - continue; - } + if (rotation == 1) /* swap x and y */ + for (int i = 0; i < w; i++) + for (int j = 0; j < h; j++) + new_layout[j][i] = layout[i][j]; + + if (rotation == 3) /* swap x and y */ + for (int i = 0; i < w; i++) + for (int j = 0; j < h; j++) + new_layout[j][i] = layout[w - i - 1][h - j - 1]; - if (cy == -1) - { - make_wall (maze, dx, dy, 0); - continue; + layout.swap (new_layout); + new_layout.free (); } - - if (cx < cy) - make_wall (maze, dx, dy, 0); - else - make_wall (maze, dx, dy, 1); + break; } } /* checks the layout to see if I can stick a horizontal(dir = 0) wall (or vertical, dir == 1) here which ends up on other walls sensibly. */ - -int +static int can_make_wall (char **maze, int dx, int dy, int dir, random_map_params *RP) { int i1; @@ -556,36 +244,68 @@ return -1; /* can't make horiz. wall here */ length++; } + return length; } + return -1; } +/* take a layout and make some rooms in it. + --works best on onions.*/ +static void +roomify_layout (char **maze, random_map_params *RP) +{ + int tries = RP->Xsize * RP->Ysize / 30; + + for (int ti = 0; ti < tries; ti++) + { + /* starting location for looking at creating a door */ + int dx = rmg_rndm (RP->Xsize); + int dy = rmg_rndm (RP->Ysize); + + /* results of checking on creating walls. */ + int cx = can_make_wall (maze, dx, dy, 0, RP); /* horizontal */ + int cy = can_make_wall (maze, dx, dy, 1, RP); /* vertical */ + + if (cx == -1) + { + if (cy != -1) + make_wall (maze, dx, dy, 1); + + continue; + } + + if (cy == -1) + { + make_wall (maze, dx, dy, 0); + continue; + } + + if (cx < cy) + make_wall (maze, dx, dy, 0); + else + make_wall (maze, dx, dy, 1); + } +} int make_wall (char **maze, int x, int y, int dir) { maze[x][y] = 'D'; /* mark a door */ + switch (dir) { case 0: /* horizontal */ { - int i1; - - for (i1 = x - 1; maze[i1][y] == 0; i1--) - maze[i1][y] = '#'; - for (i1 = x + 1; maze[i1][y] == 0; i1++) - maze[i1][y] = '#'; + for (int i1 = x - 1; maze[i1][y] == 0; --i1) maze[i1][y] = '#'; + for (int i1 = x + 1; maze[i1][y] == 0; ++i1) maze[i1][y] = '#'; break; } case 1: /* vertical */ { - int i1; - - for (i1 = y - 1; maze[x][i1] == 0; i1--) - maze[x][i1] = '#'; - for (i1 = y + 1; maze[x][i1] == 0; i1++) - maze[x][i1] = '#'; + for (int i1 = y - 1; maze[x][i1] == 0; --i1) maze[x][i1] = '#'; + for (int i1 = y + 1; maze[x][i1] == 0; ++i1) maze[x][i1] = '#'; break; } } @@ -594,22 +314,18 @@ } /* puts doors at appropriate locations in a layout. */ -void +static void doorify_layout (char **maze, random_map_params *RP) { int ndoors = RP->Xsize * RP->Ysize / 60; /* reasonable number of doors. */ - char *doorlist_x; - char *doorlist_y; int doorlocs = 0; /* # of available doorlocations */ - int i, j; - - doorlist_x = (char *) malloc (sizeof (int) * RP->Xsize * RP->Ysize); - doorlist_y = (char *) malloc (sizeof (int) * RP->Xsize * RP->Ysize); + uint16 *doorlist_x = salloc (RP->Xsize * RP->Ysize); + uint16 *doorlist_y = salloc (RP->Xsize * RP->Ysize); /* make a list of possible door locations */ - for (i = 1; i < RP->Xsize - 1; i++) - for (j = 1; j < RP->Ysize - 1; j++) + for (int i = 1; i < RP->Xsize - 1; i++) + for (int j = 1; j < RP->Ysize - 1; j++) { int sindex = surround_flag (maze, i, j, RP); @@ -623,13 +339,10 @@ while (ndoors > 0 && doorlocs > 0) { - int di; - int sindex; - - di = rndm (doorlocs); - i = doorlist_x[di]; - j = doorlist_y[di]; - sindex = surround_flag (maze, i, j, RP); + int di = rmg_rndm (doorlocs); + int i = doorlist_x[di]; + int j = doorlist_y[di]; + int sindex = surround_flag (maze, i, j, RP); if (sindex == 3 || sindex == 12) /* these are possible door sindex */ { @@ -643,376 +356,325 @@ doorlist_y[di] = doorlist_y[doorlocs]; } - free (doorlist_x); - free (doorlist_y); + sfree (doorlist_x, RP->Xsize * RP->Ysize); + sfree (doorlist_y, RP->Xsize * RP->Ysize); } void -write_map_parameters_to_string (char *buf, random_map_params *RP) +write_map_parameters_to_string (dynbuf_text &buf, random_map_params *RP) { - char small_buf[16384]; + hv_iterinit (RP->hv); - sprintf (buf, "xsize %d\nysize %d\n", RP->xsize, RP->ysize); + while (HE *he = hv_iternext (RP->hv)) + buf << HePV (he, PL_na) << ' ' << cfSvPVutf8_nolen (HeVAL (he)) << '\n'; - if (RP->wallstyle[0]) - { - sprintf (small_buf, "wallstyle %s\n", RP->wallstyle); - strcat (buf, small_buf); - } + buf.printf ("xsize %d\nysize %d\n", RP->xsize, RP->ysize); - if (RP->floorstyle[0]) - { - sprintf (small_buf, "floorstyle %s\n", RP->floorstyle); - strcat (buf, small_buf); - } + if (RP->monsterstyle[0] ) buf.printf ("monsterstyle %s\n", RP->monsterstyle); + if (RP->treasurestyle[0] ) buf.printf ("treasurestyle %s\n", RP->treasurestyle); + if (RP->layoutstyle[0] ) buf.printf ("layoutstyle %s\n", RP->layoutstyle); + if (RP->decorstyle[0] ) buf.printf ("decorstyle %s\n", RP->decorstyle); + if (RP->doorstyle[0] ) buf.printf ("doorstyle %s\n", RP->doorstyle); + if (RP->final_map.length () ) buf.printf ("final_map %s\n", &RP->final_map); + if (RP->exit_on_final_map[0]) buf.printf ("exit_on_final_map %s\n", RP->exit_on_final_map); + if (RP->this_map.length () ) buf.printf ("origin_map %s\n", &RP->this_map); + if (RP->expand2x ) buf.printf ("expand2x %d\n", RP->expand2x); + if (RP->layoutoptions1 ) buf.printf ("layoutoptions1 %d\n", RP->layoutoptions1); + if (RP->layoutoptions2 ) buf.printf ("layoutoptions2 %d\n", RP->layoutoptions2); + if (RP->layoutoptions3 ) buf.printf ("layoutoptions3 %d\n", RP->layoutoptions3); + if (RP->symmetry ) buf.printf ("symmetry %d\n", RP->symmetry); - if (RP->monsterstyle[0]) - { - sprintf (small_buf, "monsterstyle %s\n", RP->monsterstyle); - strcat (buf, small_buf); - } + if (RP->difficulty && RP->difficulty_given) + buf.printf ("difficulty %d\n", RP->difficulty); - if (RP->treasurestyle[0]) - { - sprintf (small_buf, "treasurestyle %s\n", RP->treasurestyle); - strcat (buf, small_buf); - } + if (fabs (RP->difficulty_increase - 1.f) >= (1.f / 1024.f)) + buf.printf ("difficulty_increase %f\n", RP->difficulty_increase); - if (RP->layoutstyle[0]) - { - sprintf (small_buf, "layoutstyle %s\n", RP->layoutstyle); - strcat (buf, small_buf); - } + buf.printf ("dungeon_level %d\n", RP->dungeon_level); - if (RP->decorstyle[0]) - { - sprintf (small_buf, "decorstyle %s\n", RP->decorstyle); - strcat (buf, small_buf); - } + if (RP->dungeon_depth ) buf.printf ("dungeon_depth %d\n", RP->dungeon_depth); + if (RP->decoroptions ) buf.printf ("decoroptions %d\n", RP->decoroptions); + if (RP->orientation ) buf.printf ("orientation %d\n", RP->orientation); + if (RP->origin_x ) buf.printf ("origin_x %d\n", RP->origin_x); + if (RP->origin_y ) buf.printf ("origin_y %d\n", RP->origin_y); + if (RP->treasureoptions ) buf.printf ("treasureoptions %d\n", RP->treasureoptions); + if (RP->random_seed ) buf.printf ("random_seed %u\n", RP->random_seed); +} - if (RP->doorstyle[0]) - { - sprintf (small_buf, "doorstyle %s\n", RP->doorstyle); - strcat (buf, small_buf); - } +///////////////////////////////////////////////////////////////////////////// - if (RP->exitstyle[0]) - { - sprintf (small_buf, "exitstyle %s\n", RP->exitstyle); - strcat (buf, small_buf); - } +LayoutData::LayoutData (int w, int h) +: w(w), h(h) +{ + int size = (sizeof (char *) + sizeof (char) * h) * w; - if (RP->final_map.length ()) - { - sprintf (small_buf, "final_map %s\n", &RP->final_map); - strcat (buf, small_buf); - } + col = (char **)salloc (size); - if (RP->exit_on_final_map[0]) - { - sprintf (small_buf, "exit_on_final_map %s\n", RP->exit_on_final_map); - strcat (buf, small_buf); - } + char *data = (char *)(col + w); - if (RP->this_map.length ()) - { - sprintf (small_buf, "origin_map %s\n", &RP->this_map); - strcat (buf, small_buf); - } + for (int x = w; x--; ) + col [x] = data + x * h; +} - if (RP->expand2x) - { - sprintf (small_buf, "expand2x %d\n", RP->expand2x); - strcat (buf, small_buf); - } +LayoutData::~LayoutData () +{ + int size = (sizeof (char *) + sizeof (char) * h) * w; - if (RP->layoutoptions1) - { - sprintf (small_buf, "layoutoptions1 %d\n", RP->layoutoptions1); - strcat (buf, small_buf); - } + sfree ((char *)col, size); +} - if (RP->layoutoptions2) - { - sprintf (small_buf, "layoutoptions2 %d\n", RP->layoutoptions2); - strcat (buf, small_buf); - } +void LayoutData::clear (char fill) +{ + memset (col [0], fill, w * h); +} - if (RP->layoutoptions3) - { - sprintf (small_buf, "layoutoptions3 %d\n", RP->layoutoptions3); - strcat (buf, small_buf); - } +void LayoutData::border (char fill) +{ + for (int i = 0; i < w; i++) col [i][0] = col [i][h - 1] = fill; + for (int j = 0; j < h; j++) col [0][j] = col [w - 1][j] = fill; +} - if (RP->symmetry) - { - sprintf (small_buf, "symmetry %d\n", RP->symmetry); - strcat (buf, small_buf); - } +/* function selects the layout function and gives it whatever + arguments it needs. */ +static Layout +layoutgen (random_map_params *RP) +{ + Layout layout (RP); - if (RP->difficulty && RP->difficulty_given) + switch (RP->map_layout_style) { - sprintf (small_buf, "difficulty %d\n", RP->difficulty); - strcat (buf, small_buf); - } + case LAYOUT_ONION: + map_gen_onion (layout, RP->layoutoptions1, RP->layoutoptions2); - if (RP->difficulty_increase != 1.0) - { - sprintf (small_buf, "difficulty_increase %f\n", RP->difficulty_increase); - strcat (buf, small_buf); - } + if (!(rmg_rndm (3)) && !(RP->layoutoptions1 & (RMOPT_WALLS_ONLY | RMOPT_WALL_OFF))) + roomify_layout (layout, RP); - sprintf (small_buf, "dungeon_level %d\n", RP->dungeon_level); - strcat (buf, small_buf); + break; - if (RP->dungeon_depth) - { - sprintf (small_buf, "dungeon_depth %d\n", RP->dungeon_depth); - strcat (buf, small_buf); - } + case LAYOUT_MAZE: + maze_gen (layout, RP->get_iv ("maze_type", rmg_rndm (4))); - if (RP->decoroptions) - { - sprintf (small_buf, "decoroptions %d\n", RP->decoroptions); - strcat (buf, small_buf); - } + if (!(rmg_rndm (2))) + doorify_layout (layout, RP); - if (RP->orientation) - { - sprintf (small_buf, "orientation %d\n", RP->orientation); - strcat (buf, small_buf); - } + break; - if (RP->origin_x) - { - sprintf (small_buf, "origin_x %d\n", RP->origin_x); - strcat (buf, small_buf); - } + case LAYOUT_SPIRAL: + map_gen_spiral (layout, RP->layoutoptions1); - if (RP->origin_y) - { - sprintf (small_buf, "origin_y %d\n", RP->origin_y); - strcat (buf, small_buf); - } + if (!(rmg_rndm (2))) + doorify_layout (layout, RP); - if (RP->treasureoptions) - { - sprintf (small_buf, "treasureoptions %d\n", RP->treasureoptions); - strcat (buf, small_buf); - } + break; - if (RP->random_seed) - { - sprintf (small_buf, "random_seed %u\n", RP->random_seed); - strcat (buf, small_buf); - } + case LAYOUT_ROGUELIKE: + /* Don't put symmetry in rogue maps. There isn't much reason to + * do so in the first place (doesn't make it any more interesting), + * but more importantly, the symmetry code presumes we are symmetrizing + * spirals, or maps with lots of passages - making a symmetric rogue + * map fails because its likely that the passages the symmetry process + * creates may not connect the rooms. + */ + RP->symmetry_used = SYMMETRY_NONE; + roguelike_layout_gen (layout, RP->layoutoptions1); + /* no doorifying... done already */ + break; - if (RP->custom) - { - sprintf (small_buf, "custom %s\n", RP->custom); - strcat (buf, small_buf); + case LAYOUT_SNAKE: + make_snake_layout (layout, RP->layoutoptions1); + + if (rmg_rndm (2)) + roomify_layout (layout, RP); + + break; + + case LAYOUT_SQUARE_SPIRAL: + make_square_spiral_layout (layout, RP->layoutoptions1); + + if (rmg_rndm (2)) + roomify_layout (layout, RP); + + break; + + default: + abort (); } + + /* rotate the layout randomly */ + rotate_layout (layout, rmg_rndm (4)); + + symmetrize_layout (layout, RP); + +#ifdef RMAP_DEBUG + dump_layout (layout); +#endif + + if (RP->expand2x) + expand2x (layout); + + return layout; } -void -write_parameters_to_string (char *buf, - int xsize_n, - int ysize_n, - const char *wallstyle_n, - const char *floorstyle_n, - const char *monsterstyle_n, - const char *treasurestyle_n, - const char *layoutstyle_n, - const char *decorstyle_n, - const char *doorstyle_n, - const char *exitstyle_n, - const char *final_map_n, - const char *exit_on_final_map_n, - const char *this_map_n, - int layoutoptions1_n, - int layoutoptions2_n, - int layoutoptions3_n, - int symmetry_n, - int dungeon_depth_n, - int dungeon_level_n, - int difficulty_n, - int difficulty_given_n, - int decoroptions_n, - int orientation_n, - int origin_x_n, - int origin_y_n, - uint32_t random_seed_n, - int treasureoptions_n, - float difficulty_increase) +bool +maptile::generate_random_map (random_map_params *RP) { - char small_buf[16384]; + int i; - sprintf (buf, "xsize %d\nysize %d\n", xsize_n, ysize_n); + RP->Xsize = RP->xsize; + RP->Ysize = RP->ysize; - if (wallstyle_n && wallstyle_n[0]) - { - sprintf (small_buf, "wallstyle %s\n", wallstyle_n); - strcat (buf, small_buf); - } + /* pick a random seed, or use the one from the input file */ + RP->random_seed = RP->random_seed + ? RP->random_seed + RP->dungeon_level + : time (0); - if (floorstyle_n && floorstyle_n[0]) - { - sprintf (small_buf, "floorstyle %s\n", floorstyle_n); - strcat (buf, small_buf); - } + // we run "single-threaded" + rmg_rndm.seed (RP->random_seed); - if (monsterstyle_n && monsterstyle_n[0]) - { - sprintf (small_buf, "monsterstyle %s\n", monsterstyle_n); - strcat (buf, small_buf); - } + dynbuf_text buf; + write_map_parameters_to_string (buf, RP); - if (treasurestyle_n && treasurestyle_n[0]) + if (RP->difficulty == 0) { - sprintf (small_buf, "treasurestyle %s\n", treasurestyle_n); - strcat (buf, small_buf); - } + RP->difficulty = RP->dungeon_level; /* use this instead of a map difficulty */ - if (layoutstyle_n && layoutstyle_n[0]) - { - sprintf (small_buf, "layoutstyle %s\n", layoutstyle_n); - strcat (buf, small_buf); - } + if (RP->difficulty_increase > 0.001) + RP->difficulty = (int) ((float) RP->dungeon_level * RP->difficulty_increase); - if (decorstyle_n && decorstyle_n[0]) - { - sprintf (small_buf, "decorstyle %s\n", decorstyle_n); - strcat (buf, small_buf); + if (RP->difficulty < 1) + RP->difficulty = 1; } + else + RP->difficulty_given = 1; - if (doorstyle_n && doorstyle_n[0]) - { - sprintf (small_buf, "doorstyle %s\n", doorstyle_n); - strcat (buf, small_buf); - } + if (RP->Xsize < MIN_RANDOM_MAP_SIZE) + RP->Xsize = MIN_RANDOM_MAP_SIZE + rmg_rndm (25) + 5; - if (exitstyle_n && exitstyle_n[0]) - { - sprintf (small_buf, "exitstyle %s\n", exitstyle_n); - strcat (buf, small_buf); - } + if (RP->Ysize < MIN_RANDOM_MAP_SIZE) + RP->Ysize = MIN_RANDOM_MAP_SIZE + rmg_rndm (25) + 5; - if (final_map_n && final_map_n[0]) - { - sprintf (small_buf, "final_map %s\n", final_map_n); - strcat (buf, small_buf); - } + if (RP->symmetry == SYMMETRY_RANDOM) + RP->symmetry_used = rmg_rndm (SYMMETRY_XY) + 1; + else + RP->symmetry_used = RP->symmetry; - if (exit_on_final_map_n && exit_on_final_map_n[0]) - { - sprintf (small_buf, "exit_on_final_map %s\n", exit_on_final_map_n); - strcat (buf, small_buf); - } + if (RP->symmetry_used == SYMMETRY_Y || RP->symmetry_used == SYMMETRY_XY) + RP->Ysize = RP->Ysize / 2 + 1; - if (this_map_n && this_map_n[0]) - { - sprintf (small_buf, "origin_map %s\n", this_map_n); - strcat (buf, small_buf); - } + if (RP->symmetry_used == SYMMETRY_X || RP->symmetry_used == SYMMETRY_XY) + RP->Xsize = RP->Xsize / 2 + 1; - if (layoutoptions1_n) + if (RP->expand2x > 0) { - sprintf (small_buf, "layoutoptions1 %d\n", layoutoptions1_n); - strcat (buf, small_buf); + RP->Xsize /= 2; + RP->Ysize /= 2; } - if (layoutoptions2_n) - { - sprintf (small_buf, "layoutoptions2 %d\n", layoutoptions2_n); - strcat (buf, small_buf); - } + RP->map_layout_style = LAYOUT_NONE; + /* Redo this - there was a lot of redundant code of checking for preset + * layout style and then random layout style. Instead, figure out + * the numeric layoutstyle, so there is only one area that actually + * calls the code to make the maps. + */ + if (strstr (RP->layoutstyle, "onion")) + RP->map_layout_style = LAYOUT_ONION; + else if (strstr (RP->layoutstyle, "maze")) + RP->map_layout_style = LAYOUT_MAZE; + else if (strstr (RP->layoutstyle, "spiral")) + RP->map_layout_style = LAYOUT_SPIRAL; + else if (strstr (RP->layoutstyle, "rogue")) + RP->map_layout_style = LAYOUT_ROGUELIKE; + else if (strstr (RP->layoutstyle, "snake")) + RP->map_layout_style = LAYOUT_SNAKE; + else if (strstr (RP->layoutstyle, "squarespiral")) + RP->map_layout_style = LAYOUT_SQUARE_SPIRAL; + else if (RP->map_layout_style == LAYOUT_NONE) + RP->map_layout_style = rmg_rndm (NROFLAYOUTS - 1) + 1; /* No style found - choose one randomly */ + else + abort (); - if (layoutoptions3_n) - { - sprintf (small_buf, "layoutoptions3 %d\n", layoutoptions3_n); - strcat (buf, small_buf); - } + Layout layout = layoutgen (RP); - if (symmetry_n) - { - sprintf (small_buf, "symmetry %d\n", symmetry_n); - strcat (buf, small_buf); - } +#ifdef RMAP_DEBUG + dump_layout (layout); +#endif + /* increment these for the current map */ + ++RP->dungeon_level; - if (difficulty_n && difficulty_given_n) - { - sprintf (small_buf, "difficulty %d\n", difficulty_n); - strcat (buf, small_buf); - } + // need to patch RP becasue following code doesn't use the Layout object + RP->Xsize = layout->w; + RP->Ysize = layout->h; - if (difficulty_increase > 0.001) - { - sprintf (small_buf, "difficulty_increase %f\n", difficulty_increase); - strcat (buf, small_buf); - } + /* allocate the map and set the floor */ + make_map_floor (layout, RP->get_str ("floorstyle", ""), RP); - sprintf (small_buf, "dungeon_level %d\n", dungeon_level_n); - strcat (buf, small_buf); + /* set region */ + default_region = RP->region; - if (dungeon_depth_n) - { - sprintf (small_buf, "dungeon_depth %d\n", dungeon_depth_n); - strcat (buf, small_buf); - } + CEDE; - if (decoroptions_n) - { - sprintf (small_buf, "decoroptions %d\n", decoroptions_n); - strcat (buf, small_buf); - } + place_specials_in_map (this, layout, RP); - if (orientation_n) - { - sprintf (small_buf, "orientation %d\n", orientation_n); - strcat (buf, small_buf); - } + CEDE; - if (origin_x_n) - { - sprintf (small_buf, "origin_x %d\n", origin_x_n); - strcat (buf, small_buf); - } + const char *wallstyle = RP->get_str ("wallstyle", 0); - if (origin_y_n) + /* create walls unless the wallstyle is "none" */ + if (strcmp (wallstyle, "none")) { - sprintf (small_buf, "origin_y %d\n", origin_y_n); - strcat (buf, small_buf); - } + make_map_walls (this, layout, wallstyle, RP->get_str ("miningstyle", ""), RP); - if (random_seed_n) - { - /* Add one so that the next map is a bit different */ - sprintf (small_buf, "random_seed %u\n", random_seed_n + 1); - strcat (buf, small_buf); + /* place doors unless doorstyle or wallstyle is "none" */ + if (strcmp (RP->doorstyle, "none")) + put_doors (this, layout, RP->doorstyle, RP); } - if (treasureoptions_n) - { - sprintf (small_buf, "treasureoptions %d\n", treasureoptions_n); - strcat (buf, small_buf); - } -} + CEDE; -/* copy an object with an inventory... i.e., duplicate the inv too. */ -void -copy_object_with_inv (object *src_ob, object *dest_ob) -{ - object *walk, *tmp; + const char *exitstyle = RP->get_str ("exitstyle", ""); - src_ob->copy_to (dest_ob); + /* create exits unless the exitstyle is "none" */ + if (strcmp (exitstyle, "none")) + place_exits (this, layout, exitstyle, RP->orientation, RP); - for (walk = src_ob->inv; walk; walk = walk->below) - { - tmp = object::create (); + CEDE; - walk->copy_to (tmp); - insert_ob_in_ob (tmp, dest_ob); - } + /* create monsters unless the monsterstyle is "none" */ + if (strcmp (RP->monsterstyle, "none")) + place_monsters (this, RP->monsterstyle, RP->difficulty, RP); + + CEDE; + + /* treasures needs to have a proper difficulty set for the map. */ + difficulty = estimate_difficulty (); + + CEDE; + + /* create treasure unless the treasurestyle is "none" */ + place_treasure (this, layout, RP->treasurestyle, RP->treasureoptions, RP); + + CEDE; + + /* create decor unless the decorstyle is "none" */ + if (strcmp (RP->decorstyle, "none")) + put_decor (this, layout, RP->decorstyle, RP->decoroptions, RP); + + CEDE; + + /* generate treasures, etc. */ + fix_auto_apply (); + + CEDE; + + unblock_exits (this, layout, RP); + + msg = buf; + in_memory = MAP_ACTIVE; + + CEDE; + + return 1; } +