--- deliantra/server/random_maps/exit.C 2006/08/29 08:01:36 1.2 +++ deliantra/server/random_maps/exit.C 2006/09/03 00:18:41 1.3 @@ -1,6 +1,6 @@ /* * static char *rcsid_exit_c = - * "$Id: exit.C,v 1.2 2006/08/29 08:01:36 root Exp $"; + * "$Id: exit.C,v 1.3 2006/09/03 00:18:41 root Exp $"; */ /* @@ -169,7 +169,7 @@ /* set up the up exit */ the_exit_up->stats.hp = RP->origin_x; the_exit_up->stats.sp = RP->origin_y; - the_exit_up->slaying = add_string(RP->origin_map); + the_exit_up->slaying = RP->origin_map; /* figure out where to put the entrance */ /* begin a logical block */ @@ -210,10 +210,10 @@ random_sign = get_archetype("sign"); random_sign->x = the_exit_up->x+freearr_x[j]; random_sign->y = the_exit_up->y+freearr_y[j]; - - sprintf(buf,"This is a random map.\nLevel: %d\n", (RP->dungeon_level)-1); + + sprintf(buf,"This is a random map.\nLevel: %d\n", (RP->dungeon_level)-1); - random_sign->msg = add_string(buf); + random_sign->msg = buf; insert_ob_in_map(random_sign,map,NULL,0); } } @@ -259,7 +259,7 @@ RP->origin_x = the_exit_down->x; RP->origin_y = the_exit_down->y; write_map_parameters_to_string(buf,RP); - the_exit_down->msg = add_string(buf); + the_exit_down->msg = buf; /* the identifier for making a random map. */ if(RP->dungeon_level >= RP->dungeon_depth && RP->final_map[0]!=0) { mapstruct *new_map; @@ -280,7 +280,7 @@ if((new_map=ready_map_name(RP->final_map,0)) == NULL) return; - the_exit_down->slaying = add_string(RP->final_map); + the_exit_down->slaying = RP->final_map; strcpy(new_map->path,RP->final_map); for (tmp=GET_MAP_OB(new_map, MAP_ENTER_X(new_map), MAP_ENTER_Y(new_map)); tmp; tmp=tmp->above) @@ -298,7 +298,7 @@ if (final_map_exit == 1) { /* setup the exit back */ - the_exit_back->slaying = add_string(map->path); + the_exit_back->slaying = map->path; the_exit_back->stats.hp = the_exit_down->x; the_exit_back->stats.sp = the_exit_down->y; the_exit_back->x = MAP_ENTER_X(new_map); @@ -310,7 +310,8 @@ set_map_timeout(new_map); /* So it gets swapped out */ } else - the_exit_down->slaying = add_string("/!"); + the_exit_down->slaying = "/!"; + /* Block the exit so things don't get dumped on top of it. */ the_exit_down->move_block = MOVE_ALL; insert_ob_in_map(the_exit_down,map,NULL,0);