mirror of
https://github.com/tbamud/tbamud.git
synced 2026-02-21 02:51:45 +01:00
tbaMUD 3.54
[Oct 04 2007] - Rumble Changed autoexit to display doors as Exits: n (e) w s. DISP_CLOSED_DOORS added to cedit. Added rcopy, ocopy, etc. for all forms of OLC. (thanks Neme) [Oct 01 2007] - Rumble Added trigedit variables %zonename% and %zonenumber%. (thanks Drefs) Fixed memory leak in do_dig. (thanks Neme) Added trigedit variables %roomflag% and object %affects%. (thanks Jamdog) [Sep 27 2007] - Rumble Update to do_hit to prevent crash if the player is AFF_CHARM somehow without a master. (thanks Jamdog) Removed alias.c. New ASCII aliases handled in players.c and saved in plrfiles.
This commit is contained in:
35
src/genwld.c
35
src/genwld.c
@@ -382,41 +382,6 @@ int copy_room(struct room_data *to, struct room_data *from)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* Idea by Cris Jacob. */
|
||||
room_rnum duplicate_room(room_vnum dest_vnum, room_rnum orig)
|
||||
{
|
||||
int new_rnum, znum;
|
||||
struct room_data nroom;
|
||||
|
||||
#if CIRCLE_UNSIGNED_INDEX
|
||||
if (orig == NOWHERE || orig > top_of_world) {
|
||||
#else
|
||||
if (orig < 0 || orig > top_of_world) {
|
||||
#endif
|
||||
log("SYSERR: GenOLC: copy_room: Given bad original real room.");
|
||||
return NOWHERE;
|
||||
} else if ((znum = real_zone_by_thing(dest_vnum)) == NOWHERE) {
|
||||
log("SYSERR: GenOLC: copy_room: No such destination zone.");
|
||||
return NOWHERE;
|
||||
}
|
||||
|
||||
/* add_room will make its own copies of strings. */
|
||||
if ((new_rnum = add_room(&nroom)) == NOWHERE) {
|
||||
log("SYSERR: GenOLC: copy_room: Problem adding room.");
|
||||
return NOWHERE;
|
||||
}
|
||||
|
||||
nroom = world[new_rnum];
|
||||
nroom.number = dest_vnum;
|
||||
nroom.zone = znum;
|
||||
|
||||
/* So the people and objects aren't in two places at once. */
|
||||
nroom.contents = NULL;
|
||||
nroom.people = NULL;
|
||||
|
||||
return new_rnum;
|
||||
}
|
||||
|
||||
/* Copy strings over so bad things don't happen. We do not free the existing
|
||||
* strings here because copy_room() did a shallow copy previously and we'd be
|
||||
* freeing the very strings we're copying. If this function is used elsewhere,
|
||||
|
||||
Reference in New Issue
Block a user