* client: remove rooms from the march list when zapping them (or the floors

  they're on)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 07159e8a92ce53eab8821007feeff679312f923d..53888e7250d51e6d6460636a00f1bc33e15e17e0 100644 (file)
--- 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 <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 338f10bcdb2d66250c4ca74f2ae945afbc40feb2..e1492f16d6043faf852800d4986da1a3a6933556 100644 (file)
--- 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 32bbf3a5e36b13a37c4a467ca66671beff6c0186..4c56ba65c3593a38e6c4189d747767287b717c77 100644 (file)
--- 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 eac37b0161c03d50f8b3e83dc34520b245dcfede..25565344620ab644df6b6b158414038a283de74b 100644 (file)
--- 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;