--- deliantra/server/random_maps/exit.C 2010/03/24 17:41:48 1.37 +++ deliantra/server/random_maps/exit.C 2010/06/26 22:10:18 1.43 @@ -1,9 +1,9 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team - * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team - * Copyright (©) 1992,2007 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 * * 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 @@ -117,9 +117,8 @@ 6 means southward */ void -place_exits (maptile *map, char **maze, char *exitstyle, int orientation, random_map_params *RP) +place_exits (maptile *map, char **maze, const 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; } } @@ -284,13 +278,13 @@ if (the_exit_down) { - 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; RP->origin_y = the_exit_down->y; + + dynbuf_text buf; write_map_parameters_to_string (buf, RP); the_exit_down->msg = buf;