--- deliantra/server/random_maps/exit.C 2010/03/26 00:59:21 1.38 +++ deliantra/server/random_maps/exit.C 2010/04/13 02:39:53 1.42 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * 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 * @@ -119,7 +119,6 @@ void place_exits (maptile *map, char **maze, char *exitstyle, int orientation, random_map_params *RP) { - char styledirname[1024]; maptile *style_map_down = 0; /* harder maze */ maptile *style_map_up = 0; /* easier maze */ object *the_exit_down; /* harder maze */ @@ -140,27 +139,22 @@ { 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); + style_map_up = find_style ("/styles/exitstyles/up" , exitstyle, RP->difficulty); + style_map_down = find_style ("/styles/exitstyles/down", exitstyle, RP->difficulty); 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); + style_map_up = find_style ("/styles/exitstyles/down", exitstyle, RP->difficulty); + style_map_down = find_style ("/styles/exitstyles/up" , exitstyle, RP->difficulty); break; } default: { - sprintf (styledirname, "/styles/exitstyles/generic"); - style_map_up = find_style (styledirname, exitstyle, -1); - style_map_down = style_map_up; + style_map_up = + style_map_down = find_style ("/styles/exitstyles/generic", exitstyle, RP->difficulty); break; } } @@ -286,7 +280,7 @@ { char buf[16384]; - int i = find_free_spot (the_exit_down, map, downx, downy, 1, SIZEOFFREE1 + 1); + int i = rmg_find_free_spot (the_exit_down, map, downx, downy, 1, SIZEOFFREE1 + 1); the_exit_down->x = downx + freearr_x[i]; the_exit_down->y = downy + freearr_y[i]; RP->origin_x = the_exit_down->x;