Changeset 447

Timestamp:

08/16/06 00:31:35 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p24 Archival

Files:

• 1.7.7/CHANGES.177 (modified) (1 diff)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/game/txt/hlp/penncmd.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/pennflag.hlp (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennfunc.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/penntop.hlp (modified) (1 diff)
• 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/dbdefs.h (modified) (2 diffs)
• 1.7.7/hdrs/game.h (modified) (1 diff)
• 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) (4 diffs)
• 1.7.7/src/cmds.c (modified) (1 diff)
• 1.7.7/src/command.c (modified) (1 diff)
• 1.7.7/src/create.c (modified) (1 diff)
• 1.7.7/src/db.c (modified) (1 diff)
• 1.7.7/src/flags.c (modified) (3 diffs)
• 1.7.7/src/function.c (modified) (1 diff)
• 1.7.7/src/fundb.c (modified) (1 diff)
• 1.7.7/src/notify.c (modified) (1 diff)
• 1.7.7/src/switchinc.c (modified) (1 diff)
• 1.7.7/src/wiz.c (modified) (2 diffs)

1.7.7/CHANGES.177

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 24                     October 19, 2003
+
+Minor Changes:
+  * The puppet flag can now apply to rooms. Suggested by Philip Mak.
+  * @tel/inside allows priv'd players to teleport into another player's
+    inventory (instead of to their location). Suggested by Philip Mak.
+Fixes:
+  * Startups from a created minimal.db did not properly initialize
+    the objdata htab, so subsequent use of that htab (e.g. adding
+    players to channels) would crash. Report by [LdW].
+  * Help fixes by BladedThoth@M*U*S*H and Philip Mak.
+  * Attempting to clear a branch attribute when it has leaves now
+    gives a better message. Also better message for inability to
+    write an attribute due to tree issues. Patch by Luke@M*U*S*H.
+  * Bug in @debugforwardlist fixed by Luke@M*U*S*H.
+
-
-Version 1.7.7 patchlevel 23                     October 10, 2003

1.7.7/Patchlevel

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

1.7.7/game/txt/hlp/penncmd.hlp

@@ -2971 +2971 @@
-See also: switch wildcards, @select, switch()
-& @teleport
-
+[/inside]
-
-  Teleports <object> to <room>.  <object> must be a thing; if you do not
@@ -2979 +2979 @@
-  if a room, cannot be teleport-locked against <object>. Mortals cannot
-  teleport Royalty or Wizards. If the target room has a drop-to, <object>
-
-
+
+
+
+
+
-
-  Teleportation from a room can be stopped by setting the NO_TEL flag.

1.7.7/game/txt/hlp/pennflag.hlp

@@ -586 +586 @@
-
-  If a thing or player is STICKY, it goes home when dropped (See HOMES).
-
+
+
-  If a room is STICKY, its drop-to is delayed until the last person leaves 
-  (See DROP-TOs). This flag is meaningless for exits.

1.7.7/game/txt/hlp/pennfunc.hlp

@@ -459 +459 @@
-  (A number with only the bits set in every argument set in it).
-& BASECONV()
-integ
-
-a number from one base to another. The bases can be between
-2 (B
+numb
+
+<number>, which is in base <from base> into base <to base>.
+The bases can be between 2 (b
-& BEEP()
-  beep([<number>])
@@ -3417 +3417 @@
-  See HELP CTU() for more on the angle type.
-& TEL()
-
+[,<inside>]
-
-  This function will teleport <object> to <destination>, exactly as
-  @tel <object>=<destination>. <silent> is an optional boolean that,
-
+
+
+
-
-  See also: @tel

1.7.7/game/txt/hlp/penntop.hlp

@@ -378 +378 @@
-& CREDITS
-  Maintainer: Javelin
-Trivian [TN], Halatir [LdW], Raevnos [SW
+Raevnos [SW], Ervin Hearn III [EEH
-  Porters: Nick Gammon [NJG] (win32), Dan Williams [DW] (MacOS), 
-, Ervin Hearn III [EEH] (win32)
-team: Rhyanna [RLM
+
+elopers: Rhyanna [RLM], Trivian [TN], Halatir [LdW
- 
-  The original TinyMUSH 1.0 code was written by Lawrence Foard, and was

1.7.7/game/txt/hlp/pennv177.hlp

@@ -1 @@
-3
+4
-& 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 24                     October 19, 2003
+
+Minor Changes:
+  * The puppet flag can now apply to rooms. Suggested by Philip Mak.
+  * @tel/inside allows priv'd players to teleport into another player's
+    inventory (instead of to their location). Suggested by Philip Mak.
+Fixes:
+  * Startups from a created minimal.db did not properly initialize
+    the objdata htab, so subsequent use of that htab (e.g. adding
+    players to channels) would crash. Report by [LdW].
+  * Help fixes by BladedThoth@M*U*S*H and Philip Mak.
+  * Attempting to clear a branch attribute when it has leaves now
+    gives a better message. Also better message for inability to
+    write an attribute due to tree issues. Patch by Luke@M*U*S*H.
+  * Bug in @debugforwardlist fixed by Luke@M*U*S*H.
+
+
+& 1.7.7p23
-Version 1.7.7 patchlevel 23                     October 10, 2003
-

1.7.7/game/txt/hlp/pennvOLD.hlp

@@ -4419 +4419 @@
-
-1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-
+, 24
-1.7.6: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
-1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12

1.7.7/hdrs/dbdefs.h

@@ -103 +103 @@
-/******* Thing toggles */
-#define DestOk(x)       (IS(x, TYPE_THING, "DESTROY_OK"))
-#define Puppet(x)       (IS(x, TYPE_THING, "PUPPET"))
-#define NoLeave(x)      (IS(x, TYPE_THING, "NOLEAVE"))
-#define ThingListen(x)  (IS(x, TYPE_THING, "MONITOR"))
@@ -149 +148 @@
-#define Opaque(x)       (has_flag_by_name(x, "OPAQUE", NOTYPE))
-#define Orphan(x)       (has_flag_by_name(x, "ORPHAN", NOTYPE))
+#define Puppet(x)       (has_flag_by_name(x, "PUPPET", TYPE_THING|TYPE_ROOM))
-#define Quiet(x)        (has_flag_by_name(x, "QUIET", NOTYPE))
-#define Safe(x)         (has_flag_by_name(x, "SAFE", NOTYPE))

1.7.7/hdrs/game.h

@@ -154 +154 @@
-#endif
-extern void do_teleport
-
+, int inside
-extern void do_force(dbref player, const char *what, char *command);
-extern void do_stats(dbref player, const char *name);

1.7.7/hdrs/switches.h

@@ -58 +58 @@
-#define SWITCH_IGNORE 57
-#define SWITCH_ILIST 58
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

1.7.7/hdrs/version.h

@@ -1 @@
-3 [10/10
-3
-3
+4 [10/19
+4
+4

1.7.7/src/SWITCHES

@@ -57 +57 @@
-IGNORE
-ILIST
+INSIDE
-INVENTORY
-IPRINT

1.7.7/src/attrib.c

@@ -394 +394 @@
- * \param atr name of attribute to remove.
- * \param player enactor attempting to remove attribute.
+ * \retval 0 no attribute found to reset
+ * \retval AE_SAFE attribute is safe
+ * \retval AE_ERROR other failure
- */
-int
@@ -414 +417 @@
-    return 0;
-
+  if (ptr && (AL_FLAGS(ptr) & AF_SAFE))
+    return AE_SAFE;
-  if (!Can_Write_Attr(player, thing, ptr))
--1
+AE_ERROR
-
-  len = strlen(AL_NAME(ptr));
-  sub = atr_sub_branch(ptr);
-  if (!we_are_wiping && sub)
--1
+AE_ERROR
-
-  if (!IsPlayer(thing) && !(AL_FLAGS(ptr) & AF_NODUMP))
@@ -1170 +1175 @@
-    return 0;
-  } else if (res == AE_ERROR) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-      notify(player, T("That attribute cannot be changed by you."));
-    return 0;
@@ -1524 +1538 @@
-      atr = AL_NEXT(atr);
-    }
-
-
+
+
+
-     ((AL_FLAGS(atr) & AF_INTERNAL) ||
-      (safe && (AL_FLAGS(atr) & AF_SAFE)) ||

1.7.7/src/cmds.c

@@ -818 +818 @@
-    notify(player, T("You can't teleport to nothing!"));
-  else
-
+
+
-}
-

1.7.7/src/command.c

@@ -247 +247 @@
-#endif
-
-
+ INSIDE
-   CMD_T_ANY | CMD_T_EQSPLIT | CMD_T_NOGAGGED, 0, 0},
-  {"@TRIGGER", NULL, cmd_trigger,

1.7.7/src/create.c

@@ -408 +408 @@
-      char roomstr[MAX_COMMAND_LEN];
-      sprintf(roomstr, "#%d", room);
-
+, 0
-    }
-    return room;

1.7.7/src/db.c

@@ -1305 +1305 @@
-  master_room = new_object();   /* #2 */
-
+  init_objdata_htab(DB_INITIAL_SIZE);
+
-  set_name(start_room, "Room Zero");
-  Type(start_room) = TYPE_ROOM;

1.7.7/src/flags.c

@@ -671 +671 @@
-  if ((f = match_flag("TERSE")))
-    f->type |= TYPE_THING;
+  if ((f = match_flag("PUPPET")))
+    f->type |= TYPE_ROOM;
-  if ((f = match_flag("NOSPOOF"))) {
-    f->type = NOTYPE;
@@ -1289 +1291 @@
-    /* notify the area if something stops listening, but only if it
-       wasn't listening before */
-
-
+
-    !Hearer(thing) && !Listener(thing)) {
-      tp = tbuf1;
-      safe_format(tbuf1, &tp, T("%s is no longer listening."), Name(thing));
-      *tp = '\0';
-
-
+
+
+
-      notify_except(Contents(thing), NOTHING, tbuf1, 0);
-    }
@@ -1353 +1355 @@
-      hide_player(thing, 1);
-    /* notify area if something starts listening */
-IsThing(thing) && GoodObject(Location(thing)
+!IsPlayer(thing
-    (is_flag(f, "PUPPET") || is_flag(f, "MONITOR")) && !hear && !listener) {
-      tp = tbuf1;
-      safe_format(tbuf1, &tp, T("%s is now listening."), Name(thing));
-      *tp = '\0';
-
-
+
+
+
-      notify_except(Contents(thing), NOTHING, tbuf1, 0);
-    }

1.7.7/src/function.c

@@ -477 +477 @@
-  {"T", fun_t, 1, 1, FN_REG},
-  {"TABLE", fun_table, 1, 5, FN_REG},
-3
+4
-  {"TERMINFO", fun_terminfo, 1, 1, FN_REG},
-  {"TEXTFILE", fun_textfile, 2, 2, FN_REG},

1.7.7/src/fundb.c

@@ -1701 +1701 @@
-{
-  int silent = 0;
+  int inside = 0;
-  if (!command_check_byname(executor, "@tel") || fun->flags & FN_NOSIDEFX) {
-    safe_str(T(e_perm), buff, bp);
-    return;
-  }
-== 3
+> 2
-    silent = parse_boolean(args[2]);
-
+
+
+
-}
-

1.7.7/src/notify.c

@@ -1012 +1012 @@
-    if (Paranoid(thing))
-      nsflags |= NA_PARANOID;
+  } else {
+    safe_str(msg, tbuf1, &bp);
+    *bp = 0;
-  }
-

1.7.7/src/switchinc.c

@@ -58 +58 @@
-  {"IGNORE", SWITCH_IGNORE},
-  {"ILIST", SWITCH_ILIST},
+  {"INSIDE", SWITCH_INSIDE},
-  {"INVENTORY", SWITCH_INVENTORY},
-  {"IPRINT", SWITCH_IPRINT},

1.7.7/src/wiz.c

@@ -326 +326 @@
- * \param arg2 the location to teleport to.
- * \param silent if 1, don't trigger teleport messagse.
+ * \param inside if 1, always @tel to inventory, even of a player
- */
-void
-
+
+
-{
-  dbref victim;
@@ -434 +436 @@
-    loc = Location(victim);
-
-
-
+
+
+
+
+
-      if (!silent && loc != Location(destination))
-    did_it(victim, victim, NULL, NULL, "OXTPORT", NULL, NULL, loc);