# # Patch name: quiet_for_owner_only.172p26 # Patch version: 1 # Author's name: Kurt Fitzner # Author's email: kfitzner@nexus.v-wave.com # Version of PennMUSH: 1.7.2p26 # Date patch made: Thu Aug 26 10:54:02 1999 # Author is willing to support (yes/no): yes # Patch format: diff -u5r # # # This is a contributed PennMUSH patch. Its use is subject to the # same restrictions found in PennMUSH's hdrs/copyrite.h file. # # No warranty is given for this patch. It is not necessarily going # to work on your system, with any version of PennMUSH other than # the one above, etc. # # If the author given above was willing to support the patch, you # should write to the author if you have any questions or problems. Do # *NOT* send email messages to Javelin or any PennMUSH mailing list about # this patch! # # Below this line is the author's description of the patch, # followed by the patch itself. If the patch is in context diff # format, you'll probably apply it by typing: patch < patchfile # in your top-level MUSH directory, unless instructed otherwise # below. # # # quiet_for_owner_only.172p26 # The QUIET flag, when set on a person or object, prevents messages # from reaching regarding the setting of attributes, flags, and # powers. This makes sense when the target is an object that is # owned by the player doing the setting. This might make less sense # if you are a wizard setting an attribute on another player. # # What this patch does is make the quiet flag suppress messages only # if A) it is set on you, B) it is on a target object AND you own that # object. # # This will make it less of a surprise when a wizard sets an attribute # on a QUIET player, and doesn't get a response. I have to admit, I # was puzzled when it happened to me (hence the patch). # # diff -u5r project/hdrs/dbdefs.h pennmush-vanilla/hdrs/dbdefs.h --- project/hdrs/dbdefs.h Thu Aug 26 10:54:02 1999 +++ pennmush-vanilla/hdrs/dbdefs.h Sun Jul 18 10:12:53 1999 @@ -204,11 +204,11 @@ #endif /* ROYALTY_FLAG */ #define Wizard(x) ((Flags(x) & WIZARD) || God(x)) #define Hasprivs(x) (Royalty(x) || Wizard(x) || God(x) ) #define IsQuiet(x) (Quiet(x) || Quiet(Owner(x))) -#define AreQuiet(x,y) (Quiet(x) || (Quiet(y) && (Owner(y) == x))) +#define AreQuiet(x,y) (Quiet(x) || Quiet(y)) #define Mobile(x) (IsPlayer(x) || IsThing(x)) #define Alive(x) (IsPlayer(x) || Puppet(x)) /* Was Dark() */ #define DarkLegal(x) (Dark(x) && (Wizard(x) || !Alive(x))) diff -u5r project/src/attrib.c pennmush-vanilla/src/attrib.c --- project/src/attrib.c Wed Aug 25 18:36:58 1999 +++ pennmush-vanilla/src/attrib.c Sun Jul 18 10:13:10 1999 @@ -907,11 +907,11 @@ if (s && *s) Flags(thing) |= STARTUP; else Flags(thing) &= ~STARTUP; } - if ((flags & 0x01) && !Quiet(player) && !(Quiet(thing) && (Owner(thing) == player))) + if ((flags & 0x01) && !Quiet(player) && !Quiet(thing)) notify(player, tprintf("%s/%s - %s.", Name(thing), name, s ? "Set" : "Cleared")); return 1; } void diff -u5r project/src/set.c pennmush-vanilla/src/set.c --- project/src/set.c Wed Aug 25 18:29:28 1999 +++ pennmush-vanilla/src/set.c Sun Jul 18 10:13:47 1999 @@ -429,11 +429,11 @@ if (*af->flag == NOT_TOKEN) AL_FLAGS(atr) &= ~af->f; else AL_FLAGS(atr) |= af->f; - if (!Quiet(player) && !(Quiet(thing) && (Owner(thing) == player))) + if (!Quiet(player) && !Quiet(thing)) notify(player, tprintf("%s/%s - Set.", Name(thing), AL_NAME(atr))); return 1; } diff -u5r project/src/wiz.c pennmush-vanilla/src/wiz.c --- project/src/wiz.c Wed Aug 25 18:44:41 1999 +++ pennmush-vanilla/src/wiz.c Sun Jul 18 10:13:55 1999 @@ -1226,20 +1226,20 @@ notify(player, "That is not a power."); return; } if (*power == NOT_TOKEN) { Powers(thing) &= ~pwr; - if (!Quiet(player) && !(Quiet(thing) && (Owner(thing) == player))) + if (!Quiet(player) && !Quiet(thing)) notify(player, tprintf("%s - power removed.", Name(thing))); do_log(LT_WIZ, player, thing, "Power Removed: %s", power); } else { if (Hasprivs(thing) && (pwr == IS_GUEST)) { notify(player, "You can't make admin into guests."); return; } Powers(thing) |= pwr; - if (!Quiet(player) && !(Quiet(thing) && (Owner(thing) == player))) + if (!Quiet(player) && !Quiet(thing)) notify(player, tprintf("%s - power granted.", Name(thing))); do_log(LT_WIZ, player, thing, "Power Granted: %s", power); } }