From: Rick Bird <nveid@bender.theari.com>
Date: Fri, 25 Mar 2011 21:20:18 +0000 (-0400)
Subject: PennMUSH Incorp 182p4
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=99070dc47b472e746686753df7a7cf38931c5d11;p=cobramush.git

PennMUSH Incorp 182p4
  * config() no longer lists options that can't be set
    with @config/set. Suggested by Trispis. [SW]
  * 'page foo\=bar' pages the last person you paged. Fix by Nathan
    Baum.
  * You can no longer save objects slated to be destroyed
    by using @set foo=!GOING (The help file for GOING now tells
    the truth) Reported by Cooee. [SW]
---

diff --git a/src/cmds.c b/src/cmds.c
index eac532d..36288d3 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -1091,16 +1091,13 @@ COMMAND (cmd_leave) {
 }
 
 COMMAND (cmd_page) {
-  int has_eq = 0;
-  if (args_raw && *args_raw && strchr(args_raw, '='))
-    has_eq = 1;
   if (SW_ISSET(sw, SWITCH_PORT))
     do_page_port(player, arg_left, arg_right);
   else
     do_page(player, arg_left, arg_right, cause, SW_ISSET(sw, SWITCH_NOEVAL),
 	    !(SW_ISSET(sw, SWITCH_BLIND) ||
 	      (!(SW_ISSET(sw, SWITCH_LIST)) && (BLIND_PAGE))),
-	    SW_ISSET(sw, SWITCH_OVERRIDE), has_eq);
+	    SW_ISSET(sw, SWITCH_OVERRIDE), rhs_present);
 }
 
 COMMAND (cmd_pose) {
diff --git a/src/conf.c b/src/conf.c
index ae209b2..a4b3587 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1580,14 +1580,25 @@ FUNCTION(fun_config)
     safe_str(T("#-1 NO SUCH CONFIG OPTION"), buff, bp);
     return;
   } else {
+    int first = 1;
     for (cp = conftable; cp->name; cp++) {
-      safe_str(cp->name, buff, bp);
-      safe_chr(' ', buff, bp);
+      if (cp->group) {
+	if (first)
+	  first = 0;
+	else
+	  safe_chr(' ', buff, bp);
+	safe_str(cp->name, buff, bp);
+      }
     }
     for (cp = (COBRA_CONF *) hash_firstentry(&local_options); cp;
 	 cp = (COBRA_CONF *) hash_nextentry(&local_options)) {
-      safe_str(cp->name, buff, bp);
-      safe_chr(' ', buff, bp);
+      if (cp->group) {
+	if (first)
+	  first = 0;
+	else
+	  safe_chr(' ', buff, bp);
+	safe_str(cp->name, buff, bp);
+      }
     }
   }
 }
diff --git a/src/flags.c b/src/flags.c
index b387b08..4ee9d7c 100644
--- a/src/flags.c
+++ b/src/flags.c
@@ -86,7 +86,7 @@ extern long flagdb_flags;
 FLAG flag_table[] = {
   {"CHOWN_OK", 'C', NOTYPE, CHOWN_OK, F_ANY, F_ANY},
   {"DARK", 'D', NOTYPE, DARK, F_ANY, F_ANY},
-  {"GOING", 'G', NOTYPE, GOING, F_INTERNAL, F_ANY},
+  {"GOING", 'G', NOTYPE, GOING, F_INTERNAL, F_INTERNAL},
   {"HAVEN", 'H', NOTYPE, HAVEN, F_ANY, F_ANY},
   {"LINK_OK", 'L', NOTYPE, LINK_OK, F_ANY, F_ANY},
   {"OPAQUE", 'O', NOTYPE, LOOK_OPAQUE, F_ANY, F_ANY},
diff --git a/src/fundb.c b/src/fundb.c
index 01ed051..70d3f0c 100644
--- a/src/fundb.c
+++ b/src/fundb.c
@@ -2008,9 +2008,8 @@ FUNCTION(fun_grep)
   sensitive = !strcmp(called_as, "GREP") || !strcmp(called_as, "WILDGREP");
   wild = !strcmp(called_as, "WILDGREPI") || !strcmp(called_as, "WILDGREP");
   tp = grep_util(executor, it, args[1], args[2], sensitive, wild);
-  add_check("fun_grep.attr_list");
   safe_str(tp, buff, bp);
-  mush_free((Malloc_t) tp, "fun_grep.attr_list");
+  mush_free(tp, "grep_util.buff");
 }
 
 /* Get database size statistics */