This is patch11 to PennMUSH 1.7.6. After applying this patch, you will have version 1.7.6p11 To apply this patch, save it to a file in your top-level MUSH directory, and do the following: patch -p1 < 1.7.6-patch11 make install If you use GNU patch 2.2, you probably want the above to be 'patch -b -p1', not just 'patch -p1'. Unix (or cygwin) users need not worry about failed hunks in src/switchinc.c, hdrs/switches.h, hdrs/cmds.h, or hdrs/funs.h. These files are automatically rebuilt on compile. On the off chance they appear not to be, simply rm them and re-run make. Then @shutdown and restart your MUSH. - Alan/Javelin In this patch: Minor changes: * The restart script now insures that GAMEDIR is a real directory and CONF_FILE exists therein before proceeding. Suggested by Philip Mak. * Attribute flag setting messages are more verbose. Suggested by Mike Griffiths * See_All players may use the ports() function. Suggested by Mike Griffiths. Fixes: * Wizards can no longer @chzone God. Report by Kevin@M*U*S*H. * Help fixes by Mike Griffiths. Prereq: 1.7.6p10 *** 1_7_6.154/Patchlevel Thu, 22 May 2003 13:38:21 -0500 dunemush (pennmush/5_Patchlevel 1.17.1.11.1.1.1.10 600) --- 1_7_6.160(w)/Patchlevel Mon, 02 Jun 2003 13:30:06 -0500 dunemush (pennmush/5_Patchlevel 1.17.1.11.1.1.1.11 600) *************** *** 1,2 **** Do not edit this file. It is maintained by the official PennMUSH patches. ! This is PennMUSH 1.7.6p10 --- 1,2 ---- Do not edit this file. It is maintained by the official PennMUSH patches. ! This is PennMUSH 1.7.6p11 *** 1_7_6.154/CHANGES.176 Tue, 13 May 2003 12:32:06 -0500 dunemush (pennmush/g/17_CHANGES 1.10.1.6.1.2.1.2.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.9.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1 600) --- 1_7_6.160(w)/CHANGES.176 Mon, 02 Jun 2003 13:30:01 -0500 dunemush (pennmush/g/17_CHANGES 1.10.1.6.1.2.1.2.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.9.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1 600) *************** *** 18,23 **** --- 18,37 ---- ========================================================================== + Version 1.7.6 patchlevel 11 June 1, 2003 + + Minor changes: + * The restart script now insures that GAMEDIR is a real directory + and CONF_FILE exists therein before proceeding. Suggested by + Philip Mak. + * Attribute flag setting messages are more verbose. Suggested by + Mike Griffiths + * See_All players may use the ports() function. Suggested by + Mike Griffiths. + Fixes: + * Wizards can no longer @chzone God. Report by Kevin@M*U*S*H. + * Help fixes by Mike Griffiths. + Version 1.7.6 patchlevel 10 May 13, 2003 Minor changes: *** 1_7_6.154/game/txt/hlp/pennvOLD.hlp Fri, 18 Apr 2003 21:18:09 -0500 dunemush (pennmush/g/30_pennvOLD.h 1.1.1.1.1.1 660) --- 1_7_6.160(w)/game/txt/hlp/pennvOLD.hlp Sat, 31 May 2003 16:30:44 -0500 dunemush (pennmush/g/30_pennvOLD.h 1.1.1.1.1.1.1.1 660) *************** *** 4417,4423 **** For information on a specific patchlevel of one of the versions listed, type 'help p'. For example, 'help 1.7.2p3' ! 1.7.6: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 1.7.4: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 --- 4417,4423 ---- For information on a specific patchlevel of one of the versions listed, type 'help p'. For example, 'help 1.7.2p3' ! 1.7.6: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 1.7.4: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 *** 1_7_6.154/game/txt/hlp/pennv176.hlp Tue, 13 May 2003 12:32:06 -0500 dunemush (pennmush/g/33_pennv176.h 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1 660) --- 1_7_6.160(w)/game/txt/hlp/pennv176.hlp Sat, 31 May 2003 16:30:44 -0500 dunemush (pennmush/g/33_pennv176.h 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1 660) *************** *** 1,4 **** ! & 1.7.6p10 & changes This is a list of changes in this patchlevel which are probably of interest to players. More information about new commands and functions --- 1,4 ---- ! & 1.7.6p11 & changes This is a list of changes in this patchlevel which are probably of interest to players. More information about new commands and functions *************** *** 11,16 **** --- 11,31 ---- A list of the patchlevels associated with each release can be read in 'help patchlevels'. + Version 1.7.6 patchlevel 11 May 13, 2003 + + Minor changes: + * The restart script now insures that GAMEDIR is a real directory + and CONF_FILE exists therein before proceeding. Suggested by + Philip Mak. + * Attribute flag setting messages are more verbose. Suggested by + Mike Griffiths + * See_All players may use the ports() function. Suggested by + Mike Griffiths. + Fixes: + * Wizards can no longer @chzone God. Report by Kevin@M*U*S*H. + * Help fixes by Mike Griffiths. + + & 1.7.6p10 Version 1.7.6 patchlevel 10 May 13, 2003 Minor changes: *** 1_7_6.154/game/txt/hlp/penntop.hlp Thu, 23 Jan 2003 10:20:38 -0600 dunemush (pennmush/13_penntop.hl 1.2.1.27.1.3.1.2.1.2.1.1.1.1.1.1.1.1.1.12.1.1.1.1 600) --- 1_7_6.160(w)/game/txt/hlp/penntop.hlp Sat, 31 May 2003 16:22:52 -0500 dunemush (pennmush/13_penntop.hl 1.2.1.27.1.3.1.2.1.2.1.1.1.1.1.1.1.1.1.12.1.1.1.1.1.1 600) *************** *** 876,883 **** own attributes by the child. Thus, when a $-command or @trigger is executed, "me", for example, refers to the child, not the parent, and the $-command's associated actions are performed by the child. - However, uselocks are checked on parents. Failing one stops looking - for a matching command on that parent chain. (continued in help parents3) & PARENTS3 --- 876,881 ---- *** 1_7_6.154/game/txt/hlp/pennfunc.hlp Wed, 16 Apr 2003 21:49:34 -0500 dunemush (pennmush/16_pennfunc.h 1.2.1.50.1.1.1.1.1.2.1.7.1.8.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.9.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1 600) --- 1_7_6.160(w)/game/txt/hlp/pennfunc.hlp Sat, 31 May 2003 16:30:03 -0500 dunemush (pennmush/16_pennfunc.h 1.2.1.50.1.1.1.1.1.2.1.7.1.8.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.9.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.1 600) *************** *** 1286,1293 **** & REGREP() grep(,,) regrep(,,) ! This function returns a list of attributes on containing (or matching ). is a wildcard pattern for attribute names to search; if you want to search all attributes, use "*". --- 1286,1295 ---- & REGREP() grep(,,) regrep(,,) + grepi(,,) + regrepi(,,) ! These functions return a list of attributes on containing (or matching ). is a wildcard pattern for attribute names to search; if you want to search all attributes, use "*". *************** *** 1298,1310 **** "special" characters will need to be escaped out. In grep(), is NOT wildcard matched. ! These functions are case-sensitive. grepi()/regrepi() are case-insensitive. ! & GREPI() ! grepi(,,) ! regrepi(,,) ! ! This function works exactly like grep or regrep, but is case-insensitive. ! See "help grep()" or "help regrep()" for details. & GT() gt(,) --- 1300,1306 ---- "special" characters will need to be escaped out. In grep(), is NOT wildcard matched. ! grep()/regrep() are case-sensitive. grepi()/regrepi() are case-insensitive. & GT() gt(,) *************** *** 2470,2480 **** ports() This function returns the list of descriptors ("ports") that a player, ! specified by full player name, or by dbref, is connected to. Only Wizards ! and Royalty may use this function; if a user lacks the privileges, or the ! player is not connected, an empty list is returned. Otherwise, a list of ! ports is returned in order of most recent connection to least recent ! connection. & POS() pos(,) --- 2466,2475 ---- ports() This function returns the list of descriptors ("ports") that a player, ! specified by full player name, or by dbref, is connected to. Only players ! who are See_All or privileged may use this function; in other cases, ! an empty list is returned. Otherwise, a list of ports is returned in ! order of most recent connection to least recent connection. & POS() pos(,) *************** *** 2546,2551 **** --- 2541,2547 ---- See also: edit(), regmatch() & REGMATCH() + & REGMATCHI() (Help text from TinyMUSH 2.2.4, with permission) regmatch(,[,]) regmatchi(,[,]) *** 1_7_6.154/game/restart Tue, 17 Dec 2002 00:16:47 -0600 dunemush (pennmush/39_restart 1.1.1.1.1.1.1.2.1.1.1.1.1.2.1.2.2.1 700) --- 1_7_6.160(w)/game/restart Thu, 29 May 2003 10:38:43 -0500 dunemush (pennmush/39_restart 1.1.1.1.1.1.1.2.1.1.1.1.1.2.1.2.2.1.2.1 700) *************** *** 8,16 **** # If this doesn't work, you can set GAMEDIR to the directory this # script lives in by hand. GAMEDIR=`which $0 | sed 's/\/[^\/]*$//'` - cd $GAMEDIR - echo Running from `pwd` - # The config file CONF_FILE=mush.cnf --- 8,13 ---- *************** *** 18,23 **** --- 15,34 ---- # The error log file LOG=log/netmush.log + + if [ ! -d $GAMEDIR ]; then + echo "GAMEDIR doesn't appear to be a directory. It's: $GAMEDIR" + exit 1 + fi + + cd $GAMEDIR + echo Running from `pwd` + + if [ ! -f $CONF_FILE ]; then + echo "CONF_FILE doesn't exist. It's: $CONF_FILE" + exit 1 + fi + # Internationalization stuff # Set LANG here to get international character sets and, if someone's # done it, translation of messages. *** 1_7_6.154/src/switchinc.c Thu, 22 May 2003 13:38:21 -0500 dunemush (pennmush/b/32_switchinc. 1.3.1.2.1.6.1.18.1.2.1.2.2.5.1.4.2.4.1.1.1.2.1.5.1.2.1.5.2.1.1.31.3.4.1.5.1.4.1.1.1.1.1.1.1.1 660) --- 1_7_6.160(w)/src/switchinc.c Mon, 02 Jun 2003 13:32:15 -0500 dunemush (pennmush/b/32_switchinc. 1.3.1.2.1.6.1.18.1.2.1.2.2.5.1.4.2.4.1.1.1.2.1.5.1.2.1.5.2.1.1.31.3.4.1.5.1.4.1.1.1.1.1.1.1.2 660) *************** *** 132,136 **** {"WIZARD", SWITCH_WIZARD}, {"YES", SWITCH_YES}, {"ZONE", SWITCH_ZONE}, ! {NULL, 0} }; --- 132,136 ---- {"WIZARD", SWITCH_WIZARD}, {"YES", SWITCH_YES}, {"ZONE", SWITCH_ZONE}, ! {NULL, 0} }; *** 1_7_6.154/src/set.c Thu, 17 Apr 2003 12:22:12 -0500 dunemush (pennmush/b/38_set.c 1.26.1.5.1.1.2.1.1.1.1.1.1.11.1.1.1.1.1.1.1.1 660) --- 1_7_6.160(w)/src/set.c Mon, 02 Jun 2003 13:32:15 -0500 dunemush (pennmush/b/38_set.c 1.26.1.5.1.1.2.1.1.1.1.1.1.11.1.1.1.1.1.1.1.1.1.1.1.1.1.1 660) *************** *** 343,349 **** * we only want the owner to be able to rezone the object. Also, * this allows players to @chzone themselves to an object they own. */ ! if (!Wizard(player) && !Owns(player, thing)) { if (noisy) notify(player, T("You don't have the power to shift reality.")); return 0; --- 343,349 ---- * we only want the owner to be able to rezone the object. Also, * this allows players to @chzone themselves to an object they own. */ ! if (!(God(player) || (!God(thing) && Wizard(player)) || Owns(player, thing))) { if (noisy) notify(player, T("You don't have the power to shift reality.")); return 0; *************** *** 463,478 **** if (!(Can_Write_Attr(player, thing, AL_ATTR(atr)) || ((*af->flag == NOT_TOKEN) && (af->f == AF_SAFE) && Can_Write_Attr_Ignore_Safe(player, thing, AL_ATTR(atr))))) { ! notify_format(player, T("You cannot set %s/%s"), Name(thing), AL_NAME(atr)); return 0; } ! if (*af->flag == NOT_TOKEN) AL_FLAGS(atr) &= ~af->f; ! else AL_FLAGS(atr) |= af->f; ! ! if (!Quiet(player) && !(Quiet(thing) && (Owner(thing) == player))) ! notify_format(player, "%s/%s - Set.", Name(thing), AL_NAME(atr)); return 1; } --- 463,484 ---- if (!(Can_Write_Attr(player, thing, AL_ATTR(atr)) || ((*af->flag == NOT_TOKEN) && (af->f == AF_SAFE) && Can_Write_Attr_Ignore_Safe(player, thing, AL_ATTR(atr))))) { ! notify_format(player, T("You cannot change that flag on %s/%s"), ! Name(thing), AL_NAME(atr)); return 0; } ! ! if (*af->flag == NOT_TOKEN) { AL_FLAGS(atr) &= ~af->f; ! if (!Quiet(player) && !(Quiet(thing) && (Owner(thing) == player))) ! notify_format(player, T("%s/%s - %s reset."), Name(thing), AL_NAME(atr), ! (af->flag + 1)); ! } else { AL_FLAGS(atr) |= af->f; ! if (!Quiet(player) && !(Quiet(thing) && (Owner(thing) == player))) ! notify_format(player, T("%s/%s - %s set."), Name(thing), AL_NAME(atr), ! af->flag); ! } return 1; } *** 1_7_6.154/src/bsd.c Wed, 12 Feb 2003 11:31:15 -0600 dunemush (pennmush/c/38_bsd.c 1.58.1.11.1.2.1.5.1.7.1.14.1.13.1.9.1.4.1.2.1.12.1.1.1.1.1.2.1.1.1.13.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.8.2.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1 660) --- 1_7_6.160(w)/src/bsd.c Mon, 02 Jun 2003 13:32:09 -0500 dunemush (pennmush/c/38_bsd.c 1.58.1.11.1.2.1.5.1.7.1.14.1.13.1.9.1.4.1.2.1.12.1.1.1.1.1.2.1.1.1.13.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.8.2.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1 660) *************** *** 4304,4312 **** match++; now = mudtime; ! /* If a wizard/royal types "DOING" it gives him the normal player WHO, ! * BUT flags are not shown. Wizard/royal WHO does not show @doings. ! */ if (SUPPORT_PUEBLO && (call_by->conn_flags & CONN_HTML)) { queue_newwrite(call_by, "", 19); --- 4304,4312 ---- match++; now = mudtime; ! /* If a wizard/royal types "DOING" it gives him the normal player WHO, ! * BUT flags are not shown. Wizard/royal WHO does not show @doings. ! */ if (SUPPORT_PUEBLO && (call_by->conn_flags & CONN_HTML)) { queue_newwrite(call_by, "", 19); *************** *** 5051,5064 **** FUNCTION(fun_ports) { /* returns a list of the network descriptors that a player is ! * connected to (wizard-only) */ dbref target; DESC *d; int first; ! if (!Hasprivs(executor)) { notify(executor, T("Permission denied.")); return; } --- 5051,5064 ---- FUNCTION(fun_ports) { /* returns a list of the network descriptors that a player is ! * connected to */ dbref target; DESC *d; int first; ! if (!Priv_Who(executor)) { notify(executor, T("Permission denied.")); return; } *** 1_7_6.154/hdrs/version.h Thu, 22 May 2003 13:38:21 -0500 dunemush (pennmush/c/47_version.h 1.32.1.2.1.7.1.9.1.1.1.17.1.2.1.9 660) --- 1_7_6.160(w)/hdrs/version.h Mon, 02 Jun 2003 13:32:18 -0500 dunemush (pennmush/c/47_version.h 1.32.1.2.1.7.1.9.1.1.1.17.1.2.1.10 660) *************** *** 1,2 **** ! #define VERSION "PennMUSH version 1.7.6 patchlevel 10 [05/13/2003]" ! #define SHORTVN "PennMUSH 1.7.6p10" --- 1,2 ---- ! #define VERSION "PennMUSH version 1.7.6 patchlevel 11 [06/01/2003]" ! #define SHORTVN "PennMUSH 1.7.6p11"