--- deliantra/server/random_maps/exit.C 2006/12/30 10:16:11 1.12 +++ deliantra/server/random_maps/exit.C 2006/12/31 19:02:24 1.16 @@ -1,3 +1,4 @@ + /* CrossFire, A Multiplayer game for X-windows @@ -26,11 +27,10 @@ #include #include - /* find a character in the layout. fx and fy are pointers to where to find the char. fx,fy = -1 if not found. */ void -find_in_layout (int mode, char target, int *fx, int *fy, char **layout, RMParms * RP) +find_in_layout (int mode, char target, int *fx, int *fy, char **layout, random_map_params *RP) { int M; int i, j; @@ -49,62 +49,62 @@ the same damned thing every time. */ switch (M) { - case 1: - { /* search from top left down/right */ - for (i = 1; i < RP->Xsize; i++) - for (j = 1; j < RP->Ysize; j++) - { - if (layout[i][j] == target) - { - *fx = i; - *fy = j; - return; - } - } - break; - } - case 2: - { /* Search from top right down/left */ - for (i = RP->Xsize - 2; i > 0; i--) - for (j = 1; j < RP->Ysize - 1; j++) - { - if (layout[i][j] == target) - { - *fx = i; - *fy = j; - return; - } - } - break; - } - case 3: - { /* search from bottom-left up-right */ - for (i = 1; i < RP->Xsize - 1; i++) - for (j = RP->Ysize - 2; j > 0; j--) - { - if (layout[i][j] == target) - { - *fx = i; - *fy = j; - return; - } - } - break; - } - case 4: - { /* search from bottom-right up-left */ - for (i = RP->Xsize - 2; i > 0; i--) - for (j = RP->Ysize - 2; j > 0; j--) - { - if (layout[i][j] == target) - { - *fx = i; - *fy = j; - return; - } - } - break; - } + case 1: + { /* search from top left down/right */ + for (i = 1; i < RP->Xsize; i++) + for (j = 1; j < RP->Ysize; j++) + { + if (layout[i][j] == target) + { + *fx = i; + *fy = j; + return; + } + } + break; + } + case 2: + { /* Search from top right down/left */ + for (i = RP->Xsize - 2; i > 0; i--) + for (j = 1; j < RP->Ysize - 1; j++) + { + if (layout[i][j] == target) + { + *fx = i; + *fy = j; + return; + } + } + break; + } + case 3: + { /* search from bottom-left up-right */ + for (i = 1; i < RP->Xsize - 1; i++) + for (j = RP->Ysize - 2; j > 0; j--) + { + if (layout[i][j] == target) + { + *fx = i; + *fy = j; + return; + } + } + break; + } + case 4: + { /* search from bottom-right up-left */ + for (i = RP->Xsize - 2; i > 0; i--) + for (j = RP->Ysize - 2; j > 0; j--) + { + if (layout[i][j] == target) + { + *fx = i; + *fy = j; + return; + } + } + break; + } } } @@ -117,11 +117,11 @@ 6 means southward */ void -place_exits (maptile *map, char **maze, char *exitstyle, int orientation, RMParms *RP) +place_exits (maptile *map, char **maze, char *exitstyle, int orientation, random_map_params *RP) { char styledirname[256]; - maptile *style_map_down = 0; /* harder maze */ - maptile *style_map_up = 0; /* easier maze */ + maptile *style_map_down = 0; /* harder maze */ + maptile *style_map_up = 0; /* easier maze */ object *the_exit_down; /* harder maze */ object *the_exit_up; /* easier maze */ object *random_sign; /* magic mouth saying this is a random map. */ @@ -132,42 +132,44 @@ int final_map_exit = 1; if (RP->exit_on_final_map) - { - if (strstr (RP->exit_on_final_map, "no")) - final_map_exit = 0; - } + if (strstr (RP->exit_on_final_map, "no")) + final_map_exit = 0; - if (orientation == 0) + if (!orientation) orientation = RANDOM () % 6 + 1; switch (orientation) { - case 1: - { - sprintf (styledirname, "/styles/exitstyles/up"); - style_map_up = find_style (styledirname, exitstyle, -1); - sprintf (styledirname, "/styles/exitstyles/down"); - style_map_down = find_style (styledirname, exitstyle, -1); - break; - } - case 2: - { - sprintf (styledirname, "/styles/exitstyles/down"); - style_map_up = find_style (styledirname, exitstyle, -1); - sprintf (styledirname, "/styles/exitstyles/up"); - style_map_down = find_style (styledirname, exitstyle, -1); - break; - } - default: - { - sprintf (styledirname, "/styles/exitstyles/generic"); - style_map_up = find_style (styledirname, exitstyle, -1); - style_map_down = style_map_up; - break; - } + case 1: + { + sprintf (styledirname, "/styles/exitstyles/up"); + style_map_up = find_style (styledirname, exitstyle, -1); + sprintf (styledirname, "/styles/exitstyles/down"); + style_map_down = find_style (styledirname, exitstyle, -1); + break; + } + + case 2: + { + sprintf (styledirname, "/styles/exitstyles/down"); + style_map_up = find_style (styledirname, exitstyle, -1); + sprintf (styledirname, "/styles/exitstyles/up"); + style_map_down = find_style (styledirname, exitstyle, -1); + break; + } + + default: + { + sprintf (styledirname, "/styles/exitstyles/generic"); + style_map_up = find_style (styledirname, exitstyle, -1); + style_map_down = style_map_up; + break; + } } + if (style_map_up == 0) the_exit_up = arch_to_object (archetype::find ("exit")); + else { object *tmp; @@ -180,6 +182,7 @@ if (RP->dungeon_level < RP->dungeon_depth || RP->final_map[0] != 0) if (style_map_down == 0) the_exit_down = arch_to_object (archetype::find ("exit")); + else { object *tmp; @@ -296,6 +299,7 @@ /* no indication of where to place the down exit, so just place it */ if (downx == -1) find_in_layout (0, 0, &downx, &downy, maze, RP); + if (the_exit_down) { char buf[2048]; @@ -307,31 +311,17 @@ RP->origin_y = the_exit_down->y; write_map_parameters_to_string (buf, RP); the_exit_down->msg = buf; + /* the identifier for making a random map. */ - if (RP->dungeon_level >= RP->dungeon_depth && RP->final_map[0] != 0) + if (RP->dungeon_level >= RP->dungeon_depth && *RP->final_map) { maptile *new_map; object *the_exit_back = arch_to_object (the_exit_up->arch), *tmp; -#if 0 - /* I'm not sure if there was any reason to change the path to the - * map other than to maybe make it more descriptive in the 'maps' - * command. But changing the map name makes life more complicated, - * (has_been_loaded needs to use the new name) - */ - - char new_map_name[MAX_BUF]; - - /* give the final map a name */ - sprintf (new_map_name, "%sfinal_map", RP->final_map); - /* set the exit down. */ -#endif /* load it */ - if (!(new_map = maptile::find_map (RP->final_map, 0))) + if (!(new_map = maptile::load_map_sync (RP->final_map))) return; - new_map->load (); - the_exit_down->slaying = RP->final_map; for (tmp = new_map->at (new_map->enter_x, new_map->enter_y).bot; tmp; tmp = tmp->above) @@ -357,8 +347,6 @@ insert_ob_in_map (the_exit_back, new_map, NULL, 0); } - - set_map_timeout (new_map); /* So it gets swapped out */ } else the_exit_down->slaying = "/!"; @@ -376,7 +364,7 @@ keep things from being dumped on them during the other phases of random map generation. */ void -unblock_exits (maptile *map, char **maze, RMParms * RP) +unblock_exits (maptile *map, char **maze, random_map_params *RP) { int i = 0, j = 0; object *walk;