This is patch38 to PennMUSH 1.7.7. After applying this patch, you will have version 1.7.7p38 To apply this patch, save it to a file in your top-level MUSH directory, and do the following: patch -p1 < 1.7.7-patch38 make clean 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: Commands: * @boot/silent disconnects without the standard message. Suggested by Thor@bDv. Fixes: * Crash bug in is_objid fixed. Report by Wayne@PDX. * God could cause a flag to lose its type status, and then become inaccessible. Report by Wayne@PDX. Prereq: 1.7.7p37 *** 1_7_7.1191/Patchlevel Mon, 23 Aug 2004 15:55:05 -0500 dunemush (pennmush/5_Patchlevel 1.17.1.11.1.39 600) --- 1_7_7.1195(w)/Patchlevel Wed, 25 Aug 2004 20:44:46 -0500 dunemush (pennmush/5_Patchlevel 1.17.1.11.1.40 600) *************** *** 1,2 **** Do not edit this file. It is maintained by the official PennMUSH patches. ! This is PennMUSH 1.7.7p37 --- 1,2 ---- Do not edit this file. It is maintained by the official PennMUSH patches. ! This is PennMUSH 1.7.7p38 *** 1_7_7.1191/CHANGES.177 Mon, 23 Aug 2004 15:55:05 -0500 dunemush (pennmush/g/23_CHANGES 1.48.1.258.1.14.1.187 600) --- 1_7_7.1195(w)/CHANGES.177 Wed, 25 Aug 2004 20:44:42 -0500 dunemush (pennmush/g/23_CHANGES 1.48.1.258.1.14.1.191 600) *************** *** 18,23 **** --- 18,34 ---- ========================================================================== + Version 1.7.7 patchlevel 38 August 25, 2004 + + Commands: + * @boot/silent disconnects without the standard message. + Suggested by Thor@bDv. + Fixes: + * Crash bug in is_objid fixed. Report by Wayne@PDX. + * God could cause a flag to lose its type status, and then become + inaccessible. Report by Wayne@PDX. + + Version 1.7.7 patchlevel 37 August 23, 2004 Major changes: *** 1_7_7.1191/game/txt/hlp/penncmd.hlp Fri, 20 Aug 2004 21:01:49 -0500 dunemush (pennmush/18_penncmd.hl 1.2.1.1.1.47.1.1.1.1.1.3.1.4.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.10.1.1.1.1.1.1.1.1.1.1.1.43 600) --- 1_7_7.1195(w)/game/txt/hlp/penncmd.hlp Tue, 24 Aug 2004 09:39:43 -0500 dunemush (pennmush/18_penncmd.hl 1.2.1.1.1.47.1.1.1.1.1.3.1.4.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.10.1.1.1.1.1.1.1.1.1.1.1.44 600) *************** *** 408,418 **** Example: @away me=I'm not here, please send me @mail instead. & @boot ! @boot ! @boot/port @boot/me ! Disconnects the player from the game. The /port switch takes a descriptor number instead (the "Port" number in WHO for wizards). --- 408,419 ---- Example: @away me=I'm not here, please send me @mail instead. & @boot ! @boot[/silent] ! @boot/port[/silent] @boot/me ! Disconnects the player from the game, with a standard message unless ! the /silent switch is given. The /port switch takes a descriptor number instead (the "Port" number in WHO for wizards). *** 1_7_7.1191/src/wiz.c Thu, 19 Aug 2004 14:13:49 -0500 dunemush (pennmush/b/23_wiz.c 1.44.1.1.1.1.1.2.1.7.1.1.1.1.1.1.1.1.1.1.1.8.1.2.2.2.1.2.1.1.1.1.1.1.1.2.1.1.1.2.2.17.1.9.1.30.1.3 660) --- 1_7_7.1195(w)/src/wiz.c Wed, 25 Aug 2004 20:45:53 -0500 dunemush (pennmush/b/23_wiz.c 1.44.1.1.1.1.1.2.1.7.1.1.1.1.1.1.1.1.1.1.1.8.1.2.2.2.1.2.1.1.1.1.1.1.1.2.1.1.1.2.2.17.1.9.1.30.1.3.1.1 660) *************** *** 770,775 **** --- 770,776 ---- victim = AMBIGUOUS; } break; + case BOOT_SILENT: case BOOT_NAME: /* boot by name */ if ((victim = *************** *** 793,798 **** --- 794,800 ---- } /* look up descriptor */ switch (flag) { + case BOOT_SILENT: case BOOT_NAME: d = player_desc(victim); break; *************** *** 826,832 **** notify(player, T("You boot a duplicate self.")); else { notify_format(player, T("You booted %s off!"), Name(victim)); ! notify(victim, T("You are politely shown to the door.")); } boot_desc(d); } --- 828,835 ---- notify(player, T("You boot a duplicate self.")); else { notify_format(player, T("You booted %s off!"), Name(victim)); ! if (flag != BOOT_SILENT) ! notify(victim, T("You are politely shown to the door.")); } boot_desc(d); } *** 1_7_7.1191/src/parse.c Wed, 30 Jun 2004 15:00:16 -0500 dunemush (pennmush/b/48_parse.c 1.23.1.10.1.2.1.1.1.1.1.2.1.2.1.39 660) --- 1_7_7.1195(w)/src/parse.c Wed, 25 Aug 2004 20:45:52 -0500 dunemush (pennmush/b/48_parse.c 1.23.1.10.1.2.1.1.1.1.1.2.1.2.1.40 660) *************** *** 246,251 **** --- 246,253 ---- const char *errptr; int erroffset; + if (!str) + return 0; if (!re) re = pcre_compile("^#-?\\d+(?::\\d+)?$", 0, &errptr, &erroffset, NULL); return (pcre_exec(re, NULL, str, strlen(str), 0, 0, NULL, 0) >= 0); *** 1_7_7.1191/src/flags.c Thu, 15 Jul 2004 14:45:40 -0500 dunemush (pennmush/c/20_flags.c 1.1.1.1.1.1.1.1.1.1.1.1.1.6.1.2.1.1.1.1.1.2.2.2.2.1.2.1.1.3.1.2.1.1.1.1.1.1.1.1.1.3.1.9.1.2.2.1.1.2.1.56.1.12.1.1.1.29 660) --- 1_7_7.1195(w)/src/flags.c Wed, 25 Aug 2004 20:45:52 -0500 dunemush (pennmush/c/20_flags.c 1.1.1.1.1.1.1.1.1.1.1.1.1.6.1.2.1.1.1.1.1.2.2.2.2.1.2.1.1.3.1.2.1.1.1.1.1.1.1.1.1.3.1.9.1.2.2.1.1.2.1.56.1.12.1.1.1.29.1.1 660) *************** *** 1950,1956 **** type = NOTYPE; } else { type = string_to_privs(type_privs, type_string, 0); ! if (type < 0) { notify(player, T("I don't understand the list of types.")); return; } --- 1950,1956 ---- type = NOTYPE; } else { type = string_to_privs(type_privs, type_string, 0); ! if (!type) { notify(player, T("I don't understand the list of types.")); return; } *************** *** 2034,2040 **** if (args_right[2]) { if (*args_right[2] && strcasecmp(args_right[2], "any")) type = string_to_privs(type_privs, args_right[2], 0); ! if (type < 0) { notify(player, T("I don't understand the list of types.")); return; } --- 2034,2040 ---- if (args_right[2]) { if (*args_right[2] && strcasecmp(args_right[2], "any")) type = string_to_privs(type_privs, args_right[2], 0); ! if (!type) { notify(player, T("I don't understand the list of types.")); return; } *** 1_7_7.1191/src/command.c Thu, 12 Aug 2004 12:25:12 -0500 dunemush (pennmush/c/36_command.c 1.56.1.1.1.1.1.1.1.2.1.1.1.1.1.5.1.2.1.1.1.1.1.2.1.3.1.10.1.1.3.70 660) --- 1_7_7.1195(w)/src/command.c Wed, 25 Aug 2004 20:45:51 -0500 dunemush (pennmush/c/36_command.c 1.56.1.1.1.1.1.1.1.2.1.1.1.1.1.5.1.2.1.1.1.1.1.2.1.3.1.10.1.1.3.71 660) *************** *** 70,76 **** {"@ATTRIBUTE", "ACCESS DELETE RENAME RETROACTIVE", cmd_attribute, CMD_T_ANY | CMD_T_EQSPLIT, "WIZARD", 0}, ! {"@BOOT", "PORT ME", cmd_boot, CMD_T_ANY, 0, 0}, {"@BREAK", NULL, cmd_break, CMD_T_ANY | CMD_T_EQSPLIT, 0, 0}, {"@CEMIT", "NOEVAL NOISY SPOOF", cmd_cemit, CMD_T_ANY | CMD_T_EQSPLIT | CMD_T_NOGAGGED, 0, 0}, --- 70,76 ---- {"@ATTRIBUTE", "ACCESS DELETE RENAME RETROACTIVE", cmd_attribute, CMD_T_ANY | CMD_T_EQSPLIT, "WIZARD", 0}, ! {"@BOOT", "PORT ME SILENT", cmd_boot, CMD_T_ANY, 0, 0}, {"@BREAK", NULL, cmd_break, CMD_T_ANY | CMD_T_EQSPLIT, 0, 0}, {"@CEMIT", "NOEVAL NOISY SPOOF", cmd_cemit, CMD_T_ANY | CMD_T_EQSPLIT | CMD_T_NOGAGGED, 0, 0}, *** 1_7_7.1191/src/cmds.c Wed, 21 Jul 2004 15:26:22 -0500 dunemush (pennmush/c/37_cmds.c 1.33.1.1.1.2.1.2.2.3.1.1.1.2.1.1.1.3.1.8.1.1.2.2.2.20.1.3.1.7.1.2.1.20 660) --- 1_7_7.1195(w)/src/cmds.c Wed, 25 Aug 2004 20:45:51 -0500 dunemush (pennmush/c/37_cmds.c 1.33.1.1.1.2.1.2.2.3.1.1.1.2.1.1.1.3.1.8.1.1.2.2.2.20.1.3.1.7.1.2.1.20.1.1 660) *************** *** 86,91 **** --- 86,93 ---- do_boot(player, arg_left, BOOT_DESC); else if (SW_ISSET(sw, SWITCH_ME)) do_boot(player, (char *) NULL, BOOT_SELF); + else if (SW_ISSET(sw, SWITCH_SILENT)) + do_boot(player, arg_left, BOOT_SILENT); else do_boot(player, arg_left, BOOT_NAME); } *** 1_7_7.1191/hdrs/version.h Mon, 23 Aug 2004 15:55:05 -0500 dunemush (pennmush/c/47_version.h 1.32.1.2.1.7.1.9.1.1.1.17.1.41 660) --- 1_7_7.1195(w)/hdrs/version.h Wed, 25 Aug 2004 20:45:54 -0500 dunemush (pennmush/c/47_version.h 1.32.1.2.1.7.1.9.1.1.1.17.1.42 660) *************** *** 1,4 **** #define VERSION "1.7.7" ! #define PATCHLEVEL "37" ! #define PATCHDATE "[08/23/2004]" ! #define NUMVERSION 001007007037 --- 1,4 ---- #define VERSION "1.7.7" ! #define PATCHLEVEL "38" ! #define PATCHDATE "[08/25/2004]" ! #define NUMVERSION 001007007038 *** 1_7_7.1191/hdrs/game.h Sat, 17 Jul 2004 20:41:40 -0500 dunemush (pennmush/d/12_game.h 1.28.1.2.1.1.1.1.1.1.1.7.1.22 660) --- 1_7_7.1195(w)/hdrs/game.h Wed, 25 Aug 2004 20:45:54 -0500 dunemush (pennmush/d/12_game.h 1.28.1.2.1.1.1.1.1.1.1.7.1.22.1.1 660) *************** *** 164,170 **** extern void do_stats(dbref player, const char *name); extern void do_newpassword (dbref player, const char *name, const char *password); ! enum boot_type { BOOT_NAME, BOOT_DESC, BOOT_SELF }; extern void do_boot(dbref player, const char *name, enum boot_type flag); extern void do_chzoneall(dbref player, const char *name, const char *target); extern int force_by_number(dbref player, char *command); --- 164,170 ---- extern void do_stats(dbref player, const char *name); extern void do_newpassword (dbref player, const char *name, const char *password); ! enum boot_type { BOOT_NAME, BOOT_DESC, BOOT_SELF, BOOT_SILENT }; extern void do_boot(dbref player, const char *name, enum boot_type flag); extern void do_chzoneall(dbref player, const char *name, const char *target); extern int force_by_number(dbref player, char *command); *** 1_7_7.1191/game/txt/hlp/pennvOLD.hlp Sun, 15 Aug 2004 20:33:20 -0500 dunemush (pennmush/g/30_pennvOLD.h 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.9.1.2 660) --- 1_7_7.1195(w)/game/txt/hlp/pennvOLD.hlp Wed, 25 Aug 2004 20:45:54 -0500 dunemush (pennmush/g/30_pennvOLD.h 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.9.1.2.1.1 660) *************** *** 4419,4425 **** 1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, ! 36, 37 1.7.6: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 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, --- 4419,4425 ---- 1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, ! 36, 37, 38 1.7.6: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 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, *** 1_7_7.1191/game/txt/hlp/pennv177.hlp Mon, 23 Aug 2004 15:55:05 -0500 dunemush (pennmush/g/34_pennv177.h 1.226.1.14.1.187 660) --- 1_7_7.1195(w)/game/txt/hlp/pennv177.hlp Wed, 25 Aug 2004 20:45:54 -0500 dunemush (pennmush/g/34_pennv177.h 1.226.1.14.1.191 660) *************** *** 1,4 **** ! & 1.7.7p37 & 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.7p38 & 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,28 ---- A list of the patchlevels associated with each release can be read in 'help patchlevels'. + Version 1.7.7 patchlevel 38 August 25, 2004 + + Commands: + * @boot/silent disconnects without the standard message. + Suggested by Thor@bDv. + Fixes: + * Crash bug in is_objid fixed. Report by Wayne@PDX. + * God could cause a flag to lose its type status, and then become + inaccessible. Report by Wayne@PDX. + + + & 1.7.7p37 Version 1.7.7 patchlevel 37 August 23, 2004 Major changes: