From d54a1ae9b4aded739e41e6bc450029805368b501 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 3 Sep 2003 03:24:41 +0000 Subject: [PATCH] * client: remove rooms from the march list when zapping them (or the floors they're on) --- citadel/ChangeLog | 5 ++++- citadel/citadel.c | 1 + citadel/citadel_decls.h | 1 + citadel/rooms.c | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index 07159e8a9..53888e725 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,8 @@ $Log$ + Revision 610.8 2003/09/03 03:24:40 ajc + * client: remove rooms from the march list when zapping them (or the floors + they're on) + Revision 610.7 2003/09/02 15:05:34 ajc * Repaired an incorrect adjustment of floor reference counts when a room was moved to a different floor. (Thanks to Winzlo for reporting this.) @@ -4994,4 +4998,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import - diff --git a/citadel/citadel.c b/citadel/citadel.c index 338f10bcd..e1492f16d 100644 --- a/citadel/citadel.c +++ b/citadel/citadel.c @@ -543,6 +543,7 @@ void forget_all_rooms_on(CtdlIPC *ipc, int ffloor) scr_printf("Forgetting all rooms on %s...\r", &floorlist[ffloor][0]); scr_flush(); + remove_march("_FLOOR_", ffloor); r = CtdlIPCKnownRooms(ipc, AllAccessibleRooms, ffloor, &flist, buf); if (r / 100 != 1) { scr_printf("%-72s\n", buf); diff --git a/citadel/citadel_decls.h b/citadel/citadel_decls.h index 32bbf3a5e..4c56ba65c 100644 --- a/citadel/citadel_decls.h +++ b/citadel/citadel_decls.h @@ -29,3 +29,4 @@ void formout(CtdlIPC *ipc, char *name); void sighandler(int which_sig); extern int secure; extern int can_do_msg4; +void remove_march(char *roomname, int floornum); diff --git a/citadel/rooms.c b/citadel/rooms.c index eac37b016..255653446 100644 --- a/citadel/rooms.c +++ b/citadel/rooms.c @@ -922,6 +922,7 @@ void forget(CtdlIPC *ipc) if (yesno() == 0) return; + remove_march(room_name, 0); if (CtdlIPCForgetRoom(ipc, buf) / 100 != 2) { scr_printf("%s\n", buf); return; -- 2.39.2