Changeset 439

Timestamp:

08/12/06 20:00:15 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p20 Archival

Files:

• 1.7.7/CHANGES.177 (modified) (1 diff)
• 1.7.7/Configure (modified) (1 diff)
• 1.7.7/MANIFEST (modified) (2 diffs)
• 1.7.7/Makefile.SH (modified) (1 diff)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/game/README (modified) (2 diffs)
• 1.7.7/game/restart (modified) (1 diff)
• 1.7.7/game/restrict.cnf (modified) (2 diffs)
• 1.7.7/game/txt/hlp/penncmd.hlp (modified) (5 diffs)
• 1.7.7/game/txt/hlp/pennflag.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/pennfunc.hlp (modified) (5 diffs)
• 1.7.7/game/txt/hlp/pennv177.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.7.7/hdrs/atr_tab.h (modified) (2 diffs)
• 1.7.7/hdrs/attrib.h (modified) (1 diff)
• 1.7.7/hdrs/command.h (modified) (1 diff)
• 1.7.7/hdrs/conf.h (modified) (2 diffs)
• 1.7.7/hdrs/dbdefs.h (modified) (1 diff)
• 1.7.7/hdrs/extchat.h (modified) (1 diff)
• 1.7.7/hdrs/externs.h (modified) (3 diffs)
• 1.7.7/hdrs/game.h (modified) (1 diff)
• 1.7.7/hdrs/lock.h (modified) (1 diff)
• 1.7.7/hdrs/mushdb.h (modified) (2 diffs)
• 1.7.7/hdrs/mushtype.h (modified) (2 diffs)
• 1.7.7/hdrs/switches.h (modified) (1 diff)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/src/SWITCHES (modified) (1 diff)
• 1.7.7/src/attrib.c (modified) (7 diffs)
• 1.7.7/src/bsd.c (modified) (16 diffs)
• 1.7.7/src/chunk.c (modified) (3 diffs)
• 1.7.7/src/cmds.c (modified) (3 diffs)
• 1.7.7/src/command.c (modified) (21 diffs)
• 1.7.7/src/comp_h.c (modified) (2 diffs)
• 1.7.7/src/conf.c (modified) (1 diff)
• 1.7.7/src/db.c (modified) (3 diffs)
• 1.7.7/src/extchat.c (modified) (9 diffs)
• 1.7.7/src/filecopy.c (modified) (2 diffs)
• 1.7.7/src/flags.c (modified) (18 diffs)
• 1.7.7/src/fundb.c (modified) (2 diffs)
• 1.7.7/src/funmisc.c (modified) (5 diffs)
• 1.7.7/src/funstr.c (modified) (1 diff)
• 1.7.7/src/game.c (modified) (8 diffs)
• 1.7.7/src/lock.c (modified) (2 diffs)
• 1.7.7/src/look.c (modified) (1 diff)
• 1.7.7/src/notify.c (modified) (13 diffs)
• 1.7.7/src/parse.c (modified) (5 diffs)
• 1.7.7/src/player.c (modified) (2 diffs)
• 1.7.7/src/predicat.c (modified) (2 diffs)
• 1.7.7/src/set.c (modified) (1 diff)
• 1.7.7/src/speech.c (modified) (9 diffs)
• 1.7.7/src/switchinc.c (modified) (1 diff)
• 1.7.7/src/timer.c (modified) (1 diff)
• 1.7.7/src/utils.c (modified) (2 diffs)
• 1.7.7/src/wiz.c (modified) (3 diffs)
• 1.7.7/test (added)
• 1.7.7/test/MUSHConnection.pm (added)
• 1.7.7/test/PennMUSH.pm (added)
• 1.7.7/test/TestHarness.pm (added)
• 1.7.7/test/testatree.pl (added)
• 1.7.7/test/testhastype.pl (added)

1.7.7/CHANGES.177

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 20                     September 4, 2003
+
+Major Changes:
+  * minimal.db is no more. If you start up the server and there's no
+    db to be found, it creates a new minimal database in memory
+    on the fly. Feel free to delete your coopy of minimal.db. [SW]
+    (In related news, the default OSUCC on #0 in minimal.db is gone. 
+    Suggested by Cheetah@M*U*S*H. So much for the mists.)
+Minor Changes:
+  * SSL connections are now ended before the dump when rebooting,
+    but their descriptor information sticks around to ensure that
+    their @adisconnect is run after the reboot. Based on suggestions
+    by Vadiv@M*U*S*H and [TAP].
+  * When _DEBUG is defined in a win32 build, don't copy pennmush.exe
+    to pennmush_run.exe. Makes debugging easier. Patch by Luke@M*U*S*H.
+  * In pueblo mode, no longer clear past images after each room look.
+    Patch by Konstantine Shirow.
+  * In pueblo mode, we no longer render ansi attributes or colors with
+    HTML tags; we assume the client will correctly handle them as ansi
+    intermixed with Pueblo. This solves a variety of problems.
+    Based on a discussion with Konstantine Shirow.
+  * When matching $commands and ^listens, insure that a matching attribute
+    exists before testing locks. This may break some strange locks using
+    %c, but hopefully won't. Suggested by Cheetah@M*U*S*H.
+  * The @scan command temporarily sets %c to the command to be scanned
+    (without "@scan" prefixed) so that it can detect commands that use
+    %c-matching. Based on ideas from Cheetah and Walker@M*U*S*H.
+  * Added support for Pueblo's md5 checksum. We track it on each
+    descriptor, though we don't do anything with it currently.
+  * Speed-up to fun_merge. Patch by Walker@M*U*S*H.
+  * Internal cleanup of flags in channel_broadcast.
+  * Wizards may @name themselves to names forbidden in names.cnf.
+    Patch by LeeLaLimaLLama@M*U*S*H.
+  * We are now forgiving of stupid non-RFC-compliant telnet clients
+    that send CR only even when they claim to be sending CRLF
+    (Read: MS Windows XP telnet). MS bug reported first by
+    Intrevis@M*U*S*H.
+  * Misleading restrict_command on @clone removed from restrict.cnf,
+    as @dig/@open/@create permissions already control @clone.
+    Suggested by Philip Mak.
+Functions:
+  * lstats() and quota() now allow objects to see stats/quota on other
+    objects they control (e.g., on their owners, perhaps). Suggested
+    by Philip Mak.
+  * hastype() can now test for type GARBAGE. Suggested by Tanaku@M*U*S*H.
+Commands:
+  * The new ']' command prefix causes the rest of the command-line
+    not to be evaluated by the expression parser. Try: ]think [add(1,1)]
+    Inspired by Elendor.
+  * @hook/ignore. [mux]
+  * @hook/override [Rhost, though they don't call it that]
+Attributes:
+  * @debugforwardlist forwards DEBUG output to dbrefs on the list.
+    Suggested by Balerion@M*U*S*H.
+Tests:
+  * A new test harness for developing regression test suites in perl
+    for PennMUSH is now included; few test suites are. If you can figure
+    out how to use this, write some tests for us! (If you can't, don't
+    ask about it, please :)
+Locks:
+  * @lock/interact can prevent other players from transmitting any
+    normal sound to you (that is, you won't hear them speak, pose, 
+    emit, etc., like gagging them in a client). It doesn't control
+    page (use @lock/page) or @mail (use @lock/mail). You still
+    hear 'presence' messages (connects/disconnects/arrivals/leaves)
+    so you can have a sense of who can hear you but you can't hear.
+    Patch by Philip Mak.
+Fixes:
+  * Configure script no longer keeps adding -lssl -lcrypto over and
+    over to the Makefile. Report by Sholevi@M*U*S*H.
+  * Portability fixes for compiling with MSVC5 by Luke@M*U*S*H.
+  * The behavior of spaces inside parentheses that aren't part of a
+    function has been improved. Report by Jason Newquist. [TAP]
+  * txt/*.html files were being improperly escaped before being
+    sent to Pueblo connections. Report by Konstantine Shirow.
+  * mushdb.h includes flags.h, as it relies on constants from there.
+    Suggested by Philip Mak.
+  * Better error reporting on some failure messages in chunk allocator.
+    Patch by Philip Mak.
+  * @config/set with an invalid option now returns an error.
+    Report by Sholevi@M*U*S*H.
+  * Fix to interaction checking in notify_anything that could result
+    in the wrong check being performed. Report by Philip Mak.
+  * Help fixes by LeeLaLimaLLama@M*U*S*H, Sunny@M*U*S*H, Sketch@M*U*S*H.
+
-
-Version 1.7.7 patchlevel 19                     August 19, 2003

1.7.7/Configure

@@ -4736 +4736 @@
-    if $test $? -eq 0; then
-      d_openssl="$define"
-      libs="$libs $libssl $libcrypto"
-      echo '...and at least version 0.9.6. Great.' >&4
-    else
-      echo '...but not at least version 0.9.6.' >&4
+      libssl=''
+      libcrypto=''
-    fi
-else
-    echo "You don't seem to have openssl." >&4
+    libssl=''
+    libcrypto=''
-fi
-$rm -f test_openssl* core

1.7.7/MANIFEST

@@ -170 +170 @@
-game/names.cnf
-game/restart
-game/data/minimal.db
-game/log/README
-game/save/README
@@ -232 +231 @@
-win32/pennmush.sln
-src/SWITCHES
+test/MUSHConnection.pm
+test/PennMUSH.pm
+test/TestHarness.pm
+test/testatree.pl
+test/testhastype.pl

1.7.7/Makefile.SH

@@ -43 +43 @@
-CCFLAGS=$optimize -I.. -I../hdrs $ccflags
-LDFLAGS=$ldflags
-
+ $libssl $libcrypto
-LNS=$lns
-INSTALL=$install

1.7.7/Patchlevel

@@ -1 +1 @@
-Do not edit this file. It is maintained by the official PennMUSH patches.
-19
+20

1.7.7/game/README

@@ -14 +14 @@
-  Under win32 using the Microsoft compiler, DO NOT rename mush.cnf.
-  Also, ignore the restart script.  In the configuration file, turn off
-
-
-
+
-  Then go to the game directory and run PennMUSH.exe.  Poof, you're done.
-
@@ -26 +24 @@
-  a fairly standard Berkeley UNIX setup. If you're on a HP-UX or SysV
-  machine, for example, you may need to change the restart script a bit
-
+ Then run it.
-
-
-
-
-
-
+
+
+
+
-
-.db, the god character "One" has no
-
-
-in the provided
+ database, the god character "One"
+
+
+#2 by default; in the minimal
-
-Now you should be set -- all you have to do now is customize the

1.7.7/game/restart

@@ -118 +118 @@
-     cp save/$INDB$SUFFIX.old data/$INDB$SUFFIX
-      else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-   fi
-fi

1.7.7/game/restrict.cnf

@@ -40 +40 @@
-restrict_command @lock noguest
-restrict_command @unlock noguest
-restrict_command @clone noguest
-restrict_command @create noguest
-restrict_command @dig noguest
@@ -58 +57 @@
-#restrict_command @open admin builder
-#restrict_command @dig admin builder
-#restrict_command @clone admin builder
-
-# Uncomment to disallow them to create objects

1.7.7/game/txt/hlp/penncmd.hlp

@@ -9 +9 @@
-  score          slay           take           teach          think          
-  unfollow       use            whisper        WHO            with
-
+              ]
- 
-  In addition to these, there are several types of '@' commands. @-commands 
@@ -74 +74 @@
-  @wizmotd       @wizwall       cd             ch             cv
- 
+& ]
+  The "]" command-prefix instructs the MUSH that the rest of the command
+  input that follows should not be evaluated. Here's an example:
+
+  > say [add(1,1)]
+  You say, "2"
+
+  > say \[add(1,1)\]
+  You say, "[add(1,1)]"
+
+  > ]say [add(1,1)]
+  You say, "[add(1,1)]"
+
+  > ]"[add(1,1)]
+  You say, "[add(1,1)]"
+  
+  This can be used to pass unevaluated MUSHcode to softcoded commands
+  without having to escape every special character, or to help objects
+  set attributes to contain unevaluated code.
+
-& @@
- 
@@ -1510 +1530 @@
-  in command evaluation. The possible points, indicated by the proper switch:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-  In all cases, %# is the dbref of the object doing the command, and all
-
-
-
-
+
+
+
+
+
-
-  Leaving out the object and attribute clears an existing hook. Wizards can
@@ -1947 +1978 @@
-  @lock/dropto      Who can trigger this container's drop-to.
-  @lock/destroy     Who can destroy this object if it's DESTROY_OK
+  @lock/interact        Who can send sound (say/pose/emit/etc) to this object
-
-  See also: @lock, @lset, @clock, FAILURE
@@ -2629 +2661 @@
-& @search2
-  If <class>=EXITS, OBJECTS, ROOMS, or PLAYERS, only objects of that type
+  will be listed.
-
-  If <class>=FLAGS or LFLAGS, only objects with the list of flags

1.7.7/game/txt/hlp/pennflag.hlp

@@ -200 +200 @@
-  The DEBUG flag is used for debugging MUSHcode. It is meant to be used
-  in conjunction with the VERBOSE flag. If an object is set DEBUG, all
-, in the
-
+ and to 
+any dbrefs in the object's DEBUGFORWARDLIST, in the 
- 
-  #dbref! <string to evaluate> :
@@ -213 +213 @@
-  to pinpoint exactly which evaluation is going wrong.
-  
-
-Avoid leaving it set on objects. It can also generate huge amounts of
-spam 
-
+  Avoid
+leaving it set on objects. It can also generate huge amounts of spam
+
+
-  See "help DEBUG2" for more.
-& DEBUG2

1.7.7/game/txt/hlp/pennfunc.hlp

@@ -66 +66 @@
-  aposs()       default()     edefault()    eval()        filter()
-  filterbool()  fold()        foreach()     get()         grep()
-obj()         poss()        regrep()
-i()     subj()        udefault()    ufun()        uldefault()
-
+nattr()       obj()         poss()        
+()      regrepi()     subj()        udefault()    ufun()        
+default()   ul
-
-  See also: ATTRIBUTES, NON-STANDARD ATTRIBUTES
@@ -610 +610 @@
-  clock(<channel>[/<locktype>][, <new lock>])
-
-
-
-
+
+
+
+
+
-
-  See also: @clock
@@ -1432 +1434 @@
-
-  Returns 1 if the object is of the named type, otherwise 0.
-
-
+, GARBAGE
+NO SUCH TYPE 
-& HIDDEN()
-  hidden(<player|descriptor>)
@@ -1691 +1693 @@
-  matching that pattern will be returned.
-
+  See also: nattr()
-& NATTR()
-& ATTRCNT()
@@ -3165 +3168 @@
-  Function: starttime()
- 
-
-
+
+
+
- 
-  Example:

1.7.7/game/txt/hlp/pennv177.hlp

@@ -1 @@
-19
+20
-& changes
-This is a list of changes in this patchlevel which are probably of
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.7.7 patchlevel 20                     September 4, 2003
+
+Major Changes:
+  * minimal.db is no more. If you start up the server and there's no
+    db to be found, it creates a new minimal database in memory
+    on the fly. Feel free to delete your coopy of minimal.db. [SW]
+    (In related news, the default OSUCC on #0 in minimal.db is gone. 
+    Suggested by Cheetah@M*U*S*H. So much for the mists.)
+Minor Changes:
+  * SSL connections are now ended before the dump when rebooting,
+    but their descriptor information sticks around to ensure that
+    their @adisconnect is run after the reboot. Based on suggestions
+    by Vadiv@M*U*S*H and [TAP].
+  * When _DEBUG is defined in a win32 build, don't copy pennmush.exe
+    to pennmush_run.exe. Makes debugging easier. Patch by Luke@M*U*S*H.
+  * In pueblo mode, no longer clear past images after each room look.
+    Patch by Konstantine Shirow.
+  * In pueblo mode, we no longer render ansi attributes or colors with
+    HTML tags; we assume the client will correctly handle them as ansi
+    intermixed with Pueblo. This solves a variety of problems.
+    Based on a discussion with Konstantine Shirow.
+  * When matching $commands and ^listens, insure that a matching attribute
+    exists before testing locks. This may break some strange locks using
+    %c, but hopefully won't. Suggested by Cheetah@M*U*S*H.
+  * The @scan command temporarily sets %c to the command to be scanned
+    (without "@scan" prefixed) so that it can detect commands that use
+    %c-matching. Based on ideas from Cheetah and Walker@M*U*S*H.
+  * Added support for Pueblo's md5 checksum. We track it on each
+    descriptor, though we don't do anything with it currently.
+  * Speed-up to fun_merge. Patch by Walker@M*U*S*H.
+  * Internal cleanup of flags in channel_broadcast.
+  * Wizards may @name themselves to names forbidden in names.cnf.
+    Patch by LeeLaLimaLLama@M*U*S*H.
+  * We are now forgiving of stupid non-RFC-compliant telnet clients
+    that send CR only even when they claim to be sending CRLF
+    (Read: MS Windows XP telnet). MS bug reported first by
+    Intrevis@M*U*S*H.
+  * Misleading restrict_command on @clone removed from restrict.cnf,
+    as @dig/@open/@create permissions already control @clone.
+    Suggested by Philip Mak.
+Functions:
+  * lstats() and quota() now allow objects to see stats/quota on other
+    objects they control (e.g., on their owners, perhaps). Suggested
+    by Philip Mak.
+  * hastype() can now test for type GARBAGE. Suggested by Tanaku@M*U*S*H.
+Commands:
+  * The new ']' command prefix causes the rest of the command-line
+    not to be evaluated by the expression parser. Try: ]think [add(1,1)]
+    Inspired by Elendor.
+  * @hook/ignore. [mux]
+  * @hook/override [Rhost, though they don't call it that]
+Attributes:
+  * @debugforwardlist forwards DEBUG output to dbrefs on the list.
+    Suggested by Balerion@M*U*S*H.
+Tests:
+  * A new test harness for developing regression test suites in perl
+    for PennMUSH is now included; few test suites are. If you can figure
+    out how to use this, write some tests for us! (If you can't, don't
+    ask about it, please :)
+Locks:
+  * @lock/interact can prevent other players from transmitting any
+    normal sound to you (that is, you won't hear them speak, pose, 
+    emit, etc., like gagging them in a client). It doesn't control
+    page (use @lock/page) or @mail (use @lock/mail). You still
+    hear 'presence' messages (connects/disconnects/arrivals/leaves)
+    so you can have a sense of who can hear you but you can't hear.
+    Patch by Philip Mak.
+Fixes:
+  * Configure script no longer keeps adding -lssl -lcrypto over and
+    over to the Makefile. Report by Sholevi@M*U*S*H.
+  * Portability fixes for compiling with MSVC5 by Luke@M*U*S*H.
+  * The behavior of spaces inside parentheses that aren't part of a
+    function has been improved. Report by Jason Newquist. [TAP]
+  * txt/*.html files were being improperly escaped before being
+    sent to Pueblo connections. Report by Konstantine Shirow.
+  * mushdb.h includes flags.h, as it relies on constants from there.
+    Suggested by Philip Mak.
+  * Better error reporting on some failure messages in chunk allocator.
+    Patch by Philip Mak.
+  * @config/set with an invalid option now returns an error.
+    Report by Sholevi@M*U*S*H.
+  * Fix to interaction checking in notify_anything that could result
+    in the wrong check being performed. Report by Philip Mak.
+  * Help fixes by LeeLaLimaLLama@M*U*S*H, Sunny@M*U*S*H, Sketch@M*U*S*H.
+
+
+& 1.7.7p19
-Version 1.7.7 patchlevel 19                     August 19, 2003
-

1.7.7/game/txt/hlp/pennvOLD.hlp

@@ -4418 +4418 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
+
+
-1.7.6: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
-1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12

1.7.7/hdrs/atr_tab.h

@@ -50 +50 @@
-  {"COST", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"DEATH", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
+  {"DEBUGFORWARDLIST", AF_NOPROG | AF_PRIVATE | AF_PREFIXMATCH,
+   NULL_CHUNK_REFERENCE,
+   0, NULL},
-  {"DESCFORMAT", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"DESCRIBE", AF_VISUAL | AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0,
@@ -68 +71 @@
-   NULL_CHUNK_REFERENCE, 0 | AF_PREFIXMATCH, NULL},
-  {"FORWARDLIST", AF_NOPROG | AF_PRIVATE | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE,
-
-
+
-  {"GIVE", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"HAVEN", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},

1.7.7/hdrs/attrib.h

@@ -51 +51 @@
-              char const *str, int just_match, char *atrname,
-              char **abp);
-
-
-
+
+
+
+
-extern void do_atrlock(dbref player, char const *arg1, char const *arg2);
-extern void do_atrchown(dbref player, char const *arg1, char const *arg2);

1.7.7/hdrs/command.h

@@ -146 +146 @@
-    struct hook_data before;    /**< Hook to evaluate before command */
-    struct hook_data after; /**< Hook to evaluate after command */
+    struct hook_data ignore;    /**< Hook to evaluate to decide if we should ignore hardcoded command */
+    struct hook_data override;  /**< Hook to override command with $command */
-  } hooks;
-};

1.7.7/hdrs/conf.h

@@ -34 +34 @@
-#define EMIT_TOKEN '\\'
-#define CHAT_TOKEN '+'
+#define NOEVAL_TOKEN ']'
-
-/* delimiter for lists of exit aliases */
@@ -52 +53 @@
-
-/* These CAN be modified, but it's heavily NOT suggested */
-<body bgcolor=#000000 fgcolor=#C0C0C0>
-1.1
+
+2.5
-
-

1.7.7/hdrs/dbdefs.h

@@ -95 +95 @@
-#define Terse(x)        (IS(Owner(x), TYPE_PLAYER, "TERSE") || IS(x, TYPE_THING, "TERSE"))
-#define Myopic(x)       (IS(Owner(x), TYPE_PLAYER, "MYOPIC"))
- TYPE_PLAYER, "NOSPOOF"
-(IS(Owner(x), TYPE_PLAYER, "PARANOID"
+TYPE_PLAYER,"NOSPOOF") || has_flag_by_name(x,"NOSPOOF",NOTYPE
+ (IS(Owner(x),TYPE_PLAYER,"PARANOID") || has_flag_by_name(x,"PARANOID",NOTYPE
-#define Gagged(x)       (IS(Owner(x), TYPE_PLAYER, "GAGGED"))
-#define ShowAnsi(x)     (IS(Owner(x), TYPE_PLAYER, "ANSI"))

1.7.7/hdrs/extchat.h

@@ -64 +64 @@
-#define CU_GAG      0x4     /* Do not hear any messages */
-#define CU_DEFAULT_FLAGS 0x0
+
+/* channel_broadcast flags */
+#define CB_CHECKQUIET 0x1   /* Check for quiet flag on recipients */
+#define CB_NOSPOOF    0x2   /* Use nospoof emits */
+#define CB_PRESENCE   0x4   /* This is a presence message, not sound */
-
-#define CUdbref(u) ((u)->who)

1.7.7/hdrs/externs.h

@@ -51 +51 @@
-
-extern void raw_notify(dbref player, const char *msg);
+extern void notify_list(dbref speaker, dbref thing, const char *atr,
+            const char *msg, int flags);
-extern dbref short_page(const char *match);
-extern dbref visible_short_page(dbref player, const char *match);
@@ -100 +102 @@
-#define NA_INTER_SEE    0x0400  /* Message is visual in nature */
-#define NA_INTER_PRESENCE  0x0800   /* Message is about presence */
+#define NA_NOSPOOF        0x1000    /* Message comes via a NO_SPOOF object. */
+#define NA_PARANOID       0x2000    /* Message comes via a PARANOID object. */
+#define NA_NOPREFIX       0x4000    /* Don't use @prefix when forwarding */
-#define NA_INTERACTION  (NA_INTER_HEAR|NA_INTER_SEE|NA_INTER_PRESENCE)  /* Message follows interaction rules */
-
@@ -266 +271 @@
-extern int ok_name(const char *name);
-extern int ok_command_name(const char *name);
-
+, dbref player
-extern int ok_password(const char *password);
-extern dbref parse_match_possessive(dbref player, const char *str);

1.7.7/hdrs/game.h

@@ -38 +38 @@
-extern void do_restart(void);
-extern void do_restart_com(dbref player, const char *arg1);
+
+/* From command.c */
+enum hook_type { HOOK_BEFORE, HOOK_AFTER, HOOK_IGNORE, HOOK_OVERRIDE };
+extern void do_hook(dbref player, char *command, char *obj, char *attrname,
+            enum hook_type flag);
+
-
-/* From compress.c */

1.7.7/hdrs/lock.h

@@ -103 +103 @@
-extern const lock_type Dropto_Lock; /* Who follows the dropto of this room? */
-extern const lock_type Destroy_Lock;    /* Who can @dest me if I'm dest_ok? */
+extern const lock_type Interact_Lock;
-/* Declare new lock types here! */
-

1.7.7/hdrs/mushdb.h

@@ -7 +7 @@
-
-/* Power macros */
+#include "flags.h"
-
-#define Builder(x)       (command_check_byname(x, "@dig"))
@@ -158 +159 @@
-#define RDBF_SCREENSIZE         0x01
-#define RDBF_TTYPE              0x02
+#define RDBF_PUEBLO_CHECKSUM    0x04
-
-#endif              /* __DB_H */

1.7.7/hdrs/mushtype.h

@@ -77 +77 @@
-/* Descriptor foo */
-#define DOING_LEN 40
+/** Pueblo checksum length.
+ * Pueblo uses md5 now, but if they switch to sha1, this will still
+ * be safe.
+ */
+#define PUEBLO_CHECKSUM_LEN 40
-typedef struct descriptor_data DESC;
-/** A player descriptor's data.
@@ -126 +131 @@
-  int ssl_state;        /**< Keep track of state of SSL object */
-#endif
+  char checksum[PUEBLO_CHECKSUM_LEN + 1];   /**< Pueblo checksum */
-};
-

1.7.7/hdrs/switches.h

@@ -56 +56 @@
-#define SWITCH_HERE 55
-#define SWITCH_HIDE 56
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

1.7.7/hdrs/version.h

@@ -1 @@
-19 [08/19
-19
-19
+20 [09/04
+20
+20

1.7.7/src/SWITCHES

@@ -55 +55 @@
-HERE
-HIDE
+IGNORE
-ILIST
-INVENTORY

1.7.7/src/attrib.c

@@ -698 +698 @@
-  /* check for lots of easy ways out */
-  if ((type != '$' && type != '^') || !GoodObject(thing) || Halted(thing)
-
-
-
-
+
-    return 0;
-
@@ -759 +756 @@
-    }
-    if (match_found) {
+      if ((type == '$' && !eval_lock(player, thing, Command_Lock))
+      || (type == '^' && !eval_lock(player, thing, Listen_Lock))
+      || !eval_lock(player, thing, Use_Lock)) {
+    match--;
+    continue;
+      }
-      if (atrname && abp) {
-    safe_chr(' ', atrname, abp);
@@ -818 +821 @@
-      }
-      if (match_found) {
+    if ((type == '$' && !eval