--- deliantra/server/random_maps/exit.C 2009/11/06 13:03:34 1.35 +++ deliantra/server/random_maps/exit.C 2010/03/28 22:29:50 1.40 @@ -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 @@ -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, -1); + style_map_down = find_style ("/styles/exitstyles/down", 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); + style_map_up = find_style ("/styles/exitstyles/down", exitstyle, -1); + style_map_down = find_style ("/styles/exitstyles/up" , exitstyle, -1); 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, -1); break; } } @@ -298,7 +292,7 @@ if (RP->dungeon_level >= RP->dungeon_depth && *RP->final_map) { maptile *new_map; - object *the_exit_back = arch_to_object (the_exit_up->arch); + object *the_exit_back = the_exit_up->arch->instance (); /* load it */ if (!(new_map = maptile::find_sync (RP->final_map))) @@ -333,7 +327,7 @@ } } else - the_exit_down->slaying = "/!"; + the_exit_down->slaying = shstr_random_map_exit; /* Block the exit so things don't get dumped on top of it. */ the_exit_down->move_block = MOVE_ALL;