Changeset 471

Timestamp:

08/16/06 01:21:00 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p36 Archival

Files:

• 1.7.7/CHANGES.177 (modified) (1 diff)
• 1.7.7/COPYRITE (modified) (1 diff)
• 1.7.7/MANIFEST (modified) (1 diff)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/game/aliascnf.dst (modified) (1 diff)
• 1.7.7/game/txt/hlp/penncmd.hlp (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennfunc.hlp (modified) (13 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/conf.h (modified) (1 diff)
• 1.7.7/hdrs/copyrite.h (modified) (2 diffs)
• 1.7.7/hdrs/externs.h (modified) (1 diff)
• 1.7.7/hdrs/match.h (modified) (1 diff)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/src/command.c (modified) (2 diffs)
• 1.7.7/src/destroy.c (modified) (2 diffs)
• 1.7.7/src/extmail.c (modified) (2 diffs)
• 1.7.7/src/funcrypt.c (modified) (6 diffs)
• 1.7.7/src/function.c (modified) (4 diffs)
• 1.7.7/src/fundb.c (modified) (9 diffs)
• 1.7.7/src/funlist.c (modified) (8 diffs)
• 1.7.7/src/funstr.c (modified) (11 diffs)
• 1.7.7/src/match.c (modified) (3 diffs)
• 1.7.7/src/move.c (modified) (2 diffs)
• 1.7.7/src/set.c (modified) (3 diffs)
• 1.7.7/src/strutil.c (modified) (2 diffs)
• 1.7.7/src/wiz.c (modified) (1 diff)
• 1.7.7/utils/penn-install (modified) (4 diffs)
• 1.7.7/win32/README.mingw (modified) (1 diff)
• 1.7.7/win32/confmagic.h (modified) (4 diffs)

1.7.7/CHANGES.177

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 36                     August 9, 2004
+
+Functions:
+  * l/lv/n/nv/x/xvthings() functions by Walker@M*U*S*H.
+  * New flag to locate(), 'y', for matching player names like pmatch(),
+    without requiring a leading * before the name like the 'p' flag. [SW]
+  * lattr()/nattr() works for mortals on non-owned objects, showing
+    or counting only attribs they can examine. Suggested by Philip Mak,
+    patch by Walker@M*U*S*H.
+Minor changes (user-visible):
+  * Mortals can no longer teleport HEAVY admin through exits.
+    Suggested by Ambrosia@M*U*S*H.
+Minor changes (internals):
+  * win32 directory has subdirectories for msvc6 and msvc.net. [EEH]
+  * locate() on dark rooms now works for see_all players. Suggested
+    by Wayne@PDX.
+Fixes:
+  * @mail subjects are stripped of ansi before being stored (escape
+    chars were always smashed on display). Suggested by Wayne@PDX.
+  * @command/delete by God of a non-existing command caused a crash.
+    Report by Wayne@PDX.
+  * Follow works again. Report by Shirow.
+  * Fix to digest()'s sha hash on systems without OpenSSL. [SW]
+  * @list/command no longer includes duplicates. Report by Relay@M*U*S*H. [EEH]
+  * comp() again returns -1/1 instead of -2/2. Report by Jessica Hawthorne.
+  * sort() of large floats works again. Report by Jessica Hawthorne.
+  * Linting of warnings in funlist.c. Report by Nymeria@M*U*S*H.
+  * It was possible for wizards to create circular zone chains that
+    would cause an infinite loop. Report by Wayne@PDX.
+  * safe_ansi_string was double-prepending starting ansi codes.
+    Report by Shirow.
+  * Debian packaging improvements. [EEH]
+  * Help fixes by Mike Griffiths.
+
-
-Version 1.7.7 patchlevel 35                     July 21, 2004

1.7.7/COPYRITE

@@ -171 +171 @@
- * Past and present PennMUSH development team members:
- *  T. Alexander Popiel, Ralph Melton, Thorvald Natvig, Luuk de Waard,
-
+, Ervin Hearn III
- * Past and present PennMUSH porters:
- *  Nick Gammon, Sylvia, Dan Williams, Ervin Hearn III

1.7.7/MANIFEST

@@ -234 +234 @@
-win32/options.h
-win32/patches.h
-
-
-
-
+msvc6/
+msvc6/
+msvc.net/
+msvc.net/
-win32/README.mingw
-src/SWITCHES

1.7.7/Patchlevel

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

1.7.7/game/aliascnf.dst

@@ -53 +53 @@
-function_alias modulo modulus
-function_alias randword pickrand
+function_alias lthings lobjects
+function_alias lvthings lvobjects
+function_alias nthings nobjects
+function_alias nvthings nvobjects
+function_alias xthings xobjects
+function_alias xvthings xvobjects
-
-# For rhost compatibility

1.7.7/game/txt/hlp/penncmd.hlp

@@ -2218 +2218 @@
-  @nspemit[/switches] <object>=<message>
-  @nsremit[/switches] <object> = <message>.
+  @nsoemit[/<switch>] [<room>/]<object> [<object>...] = <message>
-  @nszemit <zone> = <message>
-
-  These wizard-only commands work like @emit, @lemit, @pemit, @remit,
-
+@oemit, 
-  They are meant to be used by commands in the master room where the
-  nospoof information is just useless noise. They take all switches
-  of their respective commands.
-
-
-
+oemit, @
+oemit(), ns
-& @odeath
-  @odeath <player> [=<message>]

1.7.7/game/txt/hlp/pennfunc.hlp

@@ -1122 +1122 @@
-  See also: @lock, locktypes
-& EMIT()
+& NSEMIT()
-  emit(<message>)
-  nsemit(<message>)
@@ -1885 +1886 @@
-  lattrp(<object>[/<attribute pattern>])
- 
-
-
+
+
+
-  See_All power, or have the object set VISUAL in order to use this 
-  function on the object.
@@ -1907 +1909 @@
-
-  This function (known by two names) returns the number of attributes
-
-
-
-
-
+
+
+
-
-  nattrp() and attrpcnt() also count matching attributes on the parent.
@@ -1952 +1952 @@
-  Returns the first <length> characters from string.
-
+& NSLEMIT()
-& LEMIT()
-  lemit(<message>)
@@ -2118 +2119 @@
-    n   -   Neighbors (other objects in same location as <looker>)
-    p   -   Player names prefixed by '*'
+    y   -   Player names with or without a '*' prefix
-    z   -   English-style matching (my 2nd book) of <name>
-    *   -   All of the above (try a complete match)
@@ -2200 +2202 @@
-  function.
-
-
+
+
+
+
+
+
+
+
-& LPOS()
-  lpos(<string>, <character>)
@@ -2308 +2317 @@
-  in an object. You must be in the object or control it to use this 
-  function.
+& LVTHINGS()
+  lvthings(<object>)
+
+  This function returns the dbrefs of all connected and non-dark things
+  inside an object. You must be in the object or control it to use this 
+  function.
-& LWHO()
-  lwho()
@@ -2758 +2773 @@
-
-  See also: ncon(), nexits(), xplayers(), lplayers(), lvplayers()
+& NVTHINGS()
+& NTHINGS()
+  nthings(<object>)
+  nvthings(<object>)
+
+  These functions return a count of the things in a container.
+
+  nthings(<object>)  is identical to words(lthings(<object>))
+  nvthings(<object>) is identical to words(lvthings(<object>))
+
+  See also: ncon(), nexits(), xthings(), lthings(), lvthings()
-& NWHO()
-  nwho()
@@ -2804 +2830 @@
-
-& OEMIT()
+& NSOEMIT()
-  oemit([<room>/]<object> [<object> ...],<message>)
-  nsoemit([<room>/]<object> [<object> ...],<message>)
@@ -2870 +2897 @@
-  In this case, you must control the object.
-& PEMIT()
+& NSPEMIT()
-  pemit(<object list>,<message>)
-  nspemit(<object list>,<message>)
@@ -3049 +3077 @@
-  See also: regrab()
-& REMIT()
+& NSREMIT()
-  remit(<object>, <message>)
-  nsremit(<object>, <message>)
@@ -4453 +4482 @@
-
-  See also: nplayers(), lplayers(), lvplayers()
+& XVTHINGS()
+& XTHINGS()
+  xthings(<object>,<start>,<count>)
+  xvthings(<object>,<start>,<count>)
+
+  xthings() fetches <count> or fewer non-player dbrefs from <object>'s
+  contents starting at position <start>. It is useful when the number of
+  players in a container causes lthings() to exceed the buffer limit.
+
+  It is equivalent to extract(lthings(<object>),<start>,<count>)
+
+  xvthings() is identical, except it follows the restrictions of
+  lvthings()
+
+  See also: nthings(), lthings(), lvthings()
-& XWHO()
-& XMWHO()
@@ -4469 +4513 @@
-  See also: lwho(), mwho(), nwho()
-& ZEMIT()
+& NSZEMIT()
-  zemit(<zone>, <message>)
-  nszemit(<zone>, <message>)

1.7.7/game/txt/hlp/pennv177.hlp

@@ -1 @@
-5
+6
-& 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 36                     August 9, 2004
+
+Functions:
+  * l/lv/n/nv/x/xvthings() functions by Walker@M*U*S*H.
+  * New flag to locate(), 'y', for matching player names like pmatch(),
+    without requiring a leading * before the name like the 'p' flag. [SW]
+  * lattr()/nattr() works for mortals on non-owned objects, showing
+    or counting only attribs they can examine. Suggested by Philip Mak,
+    patch by Walker@M*U*S*H.
+Minor changes (user-visible):
+  * Mortals can no longer teleport HEAVY admin through exits.
+    Suggested by Ambrosia@M*U*S*H.
+Minor changes (internals):
+  * win32 directory has subdirectories for msvc6 and msvc.net. [EEH]
+  * locate() on dark rooms now works for see_all players. Suggested
+    by Wayne@PDX.
+Fixes:
+  * @mail subjects are stripped of ansi before being stored (escape
+    chars were always smashed on display). Suggested by Wayne@PDX.
+  * @command/delete by God of a non-existing command caused a crash.
+    Report by Wayne@PDX.
+  * Follow works again. Report by Shirow.
+  * Fix to digest()'s sha hash on systems without OpenSSL. [SW]
+  * @list/command no longer includes duplicates. Report by Relay@M*U*S*H. [EEH]
+  * comp() again returns -1/1 instead of -2/2. Report by Jessica Hawthorne.
+  * sort() of large floats works again. Report by Jessica Hawthorne.
+  * Linting of warnings in funlist.c. Report by Nymeria@M*U*S*H.
+  * It was possible for wizards to create circular zone chains that
+    would cause an infinite loop. Report by Wayne@PDX.
+  * safe_ansi_string was double-prepending starting ansi codes.
+    Report by Shirow.
+  * Debian packaging improvements. [EEH]
+  * Help fixes by Mike Griffiths.
+
+
+& 1.7.7p35
-Version 1.7.7 patchlevel 35                     July 21, 2004
-

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,
-
+
+
-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.7/hdrs/conf.h

@@ -346 +346 @@
-#define DBCK_INTERVAL    (options.dbck_interval)
-#define MAX_PARENTS (options.max_parents)
+#define MAX_ZONES (30)
-#define MAX_DEPTH (options.max_depth)
-#define MAX_PENNIES (options.max_pennies)

1.7.7/hdrs/copyrite.h

@@ -14 +14 @@
- * Copyright (c) 1994-2002, Jean Marie Diaz, Lydia Leong, and Devin Hooker.
- *
-irective
+erived
- * Copyright (c) 1995, Joseph Traub, Glenn Crocker.
- *
-irective
+erived
- * Copyright (c) 1995, David Applegate, James Aspnes, Timothy Freeman
- * and Bennet Yee.
@@ -171 +171 @@
- * Past and present PennMUSH development team members:
- *  T. Alexander Popiel, Ralph Melton, Thorvald Natvig, Luuk de Waard,
-
+, Ervin Hearn III
- * Past and present PennMUSH porters:
- *  Nick Gammon, Sylvia, Dan Williams, Ervin Hearn III

1.7.7/hdrs/externs.h

@@ -448 +448 @@
-    extern int safe_ansi_string(ansi_string *as, size_t start, size_t len,
-                char *buff, char **bp);
+    extern int safe_ansi_string2(ansi_string *as, size_t start, size_t len,
+                 char *buff, char **bp);
-/* Append N copies of the character X to the end of a string */
-    extern int safe_fill(char x, size_t n, char *buff, char **bp);

1.7.7/hdrs/match.h

@@ -20 +20 @@
-#define MAT_POSSESSION   0x000200
-#define MAT_EXIT         0x004000
+#define MAT_PMATCH       0x008000
-  /* special things to match */
-#define MAT_CARRIED_EXIT     0x010000

1.7.7/hdrs/version.h

@@ -1 +1 @@
-#define VERSION "1.7.7"
-5
-7/21
-5
+6
+8/09
+6

1.7.7/src/command.c

@@ -1377 +1377 @@
-  }
-  command = command_find(name);
+  if (!command) {
+    notify(player, T("No such command."));
+    return;
+  }
-  if (command->func != cmd_unimplemented) {
-    notify(player,
@@ -1565 +1569 @@
-    command = (COMMAND_INFO *) ptab_nextentry(&ptab_command);
-  }
+
+  do_gensort((dbref) 0, (char **) ptrs, nptrs, ALPHANUM_LIST);
-  bp = buff;
-  safe_str(ptrs[0], buff, &bp);
-  for (i = 1; i < nptrs; i++) {
-
-
+
+
+
+
+
+
-  }
-  *bp = '\0';

1.7.7/src/destroy.c

@@ -1167 +1167 @@
-{
-  dbref n, zone = NOTHING, tmp;
+  int zone_depth;
-
-  for (n = 0; n < db_top; n++) {
@@ -1177 +1178 @@
-      continue;
-    if (zone != n)      /* Objects can be zoned to themselves */
-
+
+
-    if (tmp == n) {
-      notify_format(Owner(n),

1.7.7/src/extmail.c

@@ -979 +979 @@
-  char sbuf[BUFFER_LEN];
-  ATTR *a;
+  char *cp;
-
-  if (!IsPlayer(target)) {
@@ -1007 +1008 @@
-  newp->from = player;
-  newp->from_ctime = CreTime(player);
+
-  /* Deal with the subject */
-
-
+
+
+
-  else
-    strcpy(sbuf, T("(no subject)"));

1.7.7/src/funcrypt.c

@@ -36 +36 @@
-
-
- _((char *code)
- _((char *code, char *text, int type)
+(char *code
+(char *code, char *text, int type
-
-#ifdef HAS_OPENSSL
-static void safe_hexchar(unsigned char c, char *buff, char **bp);
-#endif
+
+static void safe_sha0(const char *text, size_t len, char *buff, char **bp);
-
-/* Copy over only alphanumeric chars */
@@ -107 +109 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-{
-#ifdef HAS_OPENSSL
@@ -133 +116 @@
-  int n;
-
-args[0], arglens[0]
+text, len
-
-  for (n = 0; n < SHA_DIGEST_LENGTH; n++)
@@ -141 +124 @@
-  shsInfo.reverse_wanted = (BYTE) options.reverse_shs;
-  shsInit(&shsInfo);
-args[0], arglens[0]
+text, len
-  shsFinal(&shsInfo);
-  safe_format(buff, bp, "%0lx%0lx%0lx%0lx%0lx", shsInfo.digest[0],
@@ -149 +132 @@
-}
-
+FUNCTION(fun_encrypt)
+{
+  safe_str(crypt_code(args[1], args[0], 1), buff, bp);
+}
+
+FUNCTION(fun_decrypt)
+{
+  safe_str(crypt_code(args[1], args[0], 0), buff, bp);
+}
+
+FUNCTION(fun_checkpass)
+{
+  dbref it = match_thing(executor, args[0]);
+  if (!(GoodObject(it) && IsPlayer(it))) {
+    safe_str(T("#-1 NO SUCH PLAYER"), buff, bp);
+    return;
+  }
+  safe_boolean(password_check(it, args[1]), buff, bp);
+}
+
+FUNCTION(fun_sha0)
+{
+  safe_sha0(args[0], arglens[0], buff, bp);
+}
+
-FUNCTION(fun_digest)
-{
@@ -172 +180 @@
-#else
-  if (strcmp(args[0], "sha") == 0) {
-
-
-
-
-
-
-
-
+
-  } else {
-    safe_str(T("#-1 UNSUPPORTED DIGEST TYPE"), buff, bp);

1.7.7/src/function.c

@@ -348 +348 @@
-  {"LT", fun_lt, 2, 2, FN_REG},
-  {"LTE", fun_lte, 2, 2, FN_REG},
+  {"LTHINGS", fun_dbwalker, 1, 1, FN_REG},
-  {"LVCON", fun_dbwalker, 1, 1, FN_REG},
-  {"LVEXITS", fun_dbwalker, 1, 1, FN_REG},
-  {"LVPLAYERS", fun_dbwalker, 1, 1, FN_REG},
+  {"LVTHINGS", fun_dbwalker, 1, 1, FN_REG},
-  {"LWHO", fun_lwho, 0, 0, FN_REG},
-  {"MAIL", fun_mail, 0, 2, FN_REG},
@@ -400 +402 @@
-  {"NSREMIT", fun_remit, 2, -2, FN_REG},
-  {"NSZEMIT", fun_zemit, 2, -2, FN_REG},
+  {"NTHINGS", fun_dbwalker, 1, 1, FN_REG},
-  {"NUM", fun_num, 1, 1, FN_REG},
-  {"NULL", fun_null, 1, INT_MAX, FN_REG},
@@ -405 +408 @@
-  {"NVEXITS", fun_dbwalker, 1, 1, FN_REG},
-  {"NVPLAYERS", fun_dbwalker, 1, 1, FN_REG},
+  {"NVTHINGS", fun_dbwalker, 1, 1, FN_REG},
-  {"NWHO", fun_nwho, 0, 0, FN_REG},
-  {"OBJ", fun_obj, 1, 1, FN_REG},
@@ -547 +551 @@
-  {"XGET", fun_xget, 2, 2, FN_REG},
-  {"XOR", fun_xor, 2, INT_MAX, FN_REG},
+  {"XTHINGS", fun_dbwalker, 3, 3, FN_REG},
-  {"XVCON", fun_dbwalker, 3, 3, FN_REG},
-  {"XVEXITS", fun_dbwalker, 3, 3, FN_REG},
-  {"XVPLAYERS", fun_dbwalker, 3, 3, FN_REG},
+  {"XVTHINGS", fun_dbwalker, 3, 3, FN_REG},
-  {"XWHO", fun_xwho, 2, 2, FN_REG},
-  {"ZEMIT", fun_zemit, 2, -2, FN_REG},

1.7.7/src/fundb.c

@@ -125 +125 @@
-    return;
-  }
-  if (!Can_Examine(executor, thing)) {
-    safe_str(T(e_perm), buff, bp);
-    return;
-  }
-
-  doparent = strchr(called_as, 'P') ? 1 : 0;
-
-
+ && Can_Examine(executor, thing)
-    safe_integer(AttrCount(thing), buff, bp);
-  } else {
- 0), buff,
-
+
+          !Can_Examine(executor, thing)), buff,
-  }
-}
@@ -173 +169 @@
-  if (!GoodObject(thing)) {
-    safe_str(T(e_notvis), buff, bp);
-    return;
-  }
-  if (!Can_Examine(executor, thing)) {
-    safe_str(T(e_perm), buff, bp);
-    return;
-  }
@@ -183 +175 @@
-  lh.bp = bp;
-  if (strchr(called_as, 'P')) {
-
+
+
+
-  } else {
-
+
+
-  }
-}
@@ -628 +623 @@
-  int nthing;
-  dbref thing;
-, validthing
+
-  dbref startdb;
-
@@ -652 +647 @@
-    first = 1;
-    DOLIST_VISIBLE(thing, startdb, executor) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    if (result == NOTHING) {
-      if (after == NOTHING)
-        result = thing;
-      if (after == thing)
-        after = NOTHING;
-    }
-    if (retcount)
-      *retcount = nthing;
-      }
+      if (result == NOTHING) {
+    if (after == NOTHING)
+      result = thing;
+    if (after == thing)
+      after = NOTHING;
+      }
+      if (retcount)
+    *retcount = nthing;
-    }
-  } else if (buff)
@@ -726 +726 @@
-  switch (*ptr) {
-  case 'C':         /* con */
+    type = TYPE_THING | TYPE_PLAYER;
+    break;
+  case 'T':         /* things */
-    type = TYPE_THING;
-    break;
@@ -736 +739 @@
-  default:
-    /* This should never be reached ... */
-
+ | TYPE_PLAYER
-  }
-
@@ -1730 +1733 @@
-      match_flags |= MAT_NEIGHBOR;
-      break;
+    case 'y':
+      match_flags |= MAT_PMATCH;
+      break;
-    case 'p':
-      match_flags |= MAT_PLAYER;
@@ -1777 +1783 @@
-      safe_dbref(NOTHING, buff, bp);
-  } else {
-
+
+
-      safe_dbref(item, buff, bp);
-    else

1.7.7/src/funlist.c

@@ -19 +19 @@
-#include "pcre.h"
-#include "match.h"
+#include "command.h"
-#include "attrib.h"
-#include "dbdefs.h"
@@ -701 +702 @@
-typedef void (*makerecord) (s_rec *, dbref player, char *sortflags);
-
-
+
+
+
+
-
-/** Sorting strings by different values. We store both the string and
@@ -780 +784 @@
-  const s_rec *sr1 = (const s_rec *) s1;
-  const s_rec *sr2 = (const s_rec *) s2;
-int
+NVAL
-  res = sr1->numval - sr2->numval;
-  return Compare(res, sr1, sr2);
@@ -809 +813 @@
-GENRECORD(gen_db_name)
-{
-
+(char *) 
-  if (RealGoodObject(rec->db))
-    rec->str = (char *) Name(rec->db);
@@ -860 +864 @@
-  /* Eek, I hate dealing with memory issues. */
-
-
+(char *) 
-  const char *ptr;
-
@@ -1028 +1032 @@
-     i++) ;
-  }
-  // FIXME
-  s1.freestr = s2.freestr = 0;
-  if (ltypelist[i].isdbs) {
@@ -1086 +1089 @@
-     sorti++) ;
-  }
-  // FIXME
-  sp = (s_rec *) mush_malloc(n * sizeof(s_rec), "do_gensort");
-  for (i = 0; i < n; i++) {
@@ -2852 +2854 @@
-
-/* string, regexp, replacement string. Acts like sed or perl's s///g,
-//
+ * 
-int re_subpatterns = -1;  /**< Number of subpatterns in regexp */
-int *re_offsets;      /**< Array of offsets to subpatterns */

1.7.7/src/funstr.c

@@ -47 +47 @@
-              int linenum, char *fieldsep, int fslen, char *linesep,
-              int lslen, char filler);
+static int comp_gencomp(dbref executor, char *left, char *right, char *type);
-void init_tag_hashtab(void);
-void init_pronouns(void);
@@ -461 +462 @@
-}
-
+static int
+comp_gencomp(dbref executor, char *left, char *right, char *type)
+{
+  int c;
+  c = gencomp(executor, left, right, type);
+  return (c > 0 ? 1 : (c < 0 ? -1 : 0));
+}
+
-/* ARGSUSED */
-FUNCTION(fun_comp)
@@ -482 +491 @@
-      r = remove_markup(args[1], &rlen);
-      memcpy(right, r, rlen);
-
+
+
-      return;
-    }
@@ -493 +503 @@
-      r = remove_markup(args[1], &rlen);
-      memcpy(right, r, rlen);
-gencomp(executor, left, right, INSENS_ALPHANUM_LIST), buff
-
+comp_gencomp(executor, left, right, INSENS_ALPHANUM_LIST)
+uff, b
-      return;
-    }
@@ -502 +512 @@
-      return;
-    }
-
+
+
-    return;
-  case 'F':
@@ -509 +520 @@
-      return;
-    }
-
+
+
-    return;
-  case 'D':
@@ -520 +532 @@
-    return;
-      }
-
+
+
-      return;
-    }
@@ -1790 +1803 @@
-    if (ansilen < 0) {
-      /* word doesn't fit on one line, so cut it */
-
+2
-      safe_chr('-', buff, bp);
-      pstr += ansiwidth - 1;    /* move to start of next line */
-    } else {
-      /* normal line */
-
+2
-      if (pstr[ansilen] == '\r')
-    ++ansilen;
@@ -1858 +1871 @@
-    if (!*ptr) {
-      if (len > 0) {
-
+2
-      }
-      ptrs[i] = ptr;
@@ -1865 +1878 @@
-      len = (tptr - ptrs[i]) + 1;
-      if (len > 0) {
-
+2
-      }
-      ptrs[i] = ptr + 1;
@@ -1875 +1888 @@
-      len = (tptr - ptrs[i]) + 1;
-      if (len > 0) {
-
+2
-      }
-      ptrs[i] = lastspace;
-    } else {
-      if (len > 0) {
-
+2
-      }
-      ptrs[i] = ptr;

1.7.7/src/match.c

@@ -65 +65 @@
-#define match_absolute(name) parse_objid(name)
-static dbref match_player(const dbref matcher, const char *match_name);
+static dbref match_pmatch(const dbref matcher, const char *match_name);
-static dbref choose_thing(const dbref match_who, const int preferred_type,
-              long int flags, dbref thing1, dbref thing2);
@@ -342 +343 @@
-    return match;
-    }
+    if (flags & MAT_PMATCH) {
+      match = match_pmatch(who, name);
+      if (GoodObject(match))
+    return match;
+    }
-  } else {
-    /* We're doing a nearby match and the player doesn't have
@@ -485 +491 @@
-    return NOTHING;
-  for (p = match_name + 1; isspace((unsigned char) *p); p++) ;
+  /* If lookup_player fails, try a partial match on connected
+   * players, 2.0 style. That can return match, NOTHING, AMBIGUOUS
+   */
+  match = lookup_player(p);
+  return (match != NOTHING) ? match : visible_short_page(matcher, p);
+}
+
+static dbref
+match_pmatch(const dbref matcher, const char *match_name)
+{
+  dbref match;
+  const char *p;
+
+  for (p = match_name; isspace((unsigned char) *p); p++) ;
-  /* If lookup_player fails, try a partial match on connected
-   * players, 2.0 style. That can return match, NOTHING, AMBIGUOUS

1.7.7/src/move.c

@@ -443 +443 @@
-      /* Move the followers if the leader is elsewhere */
-      if (Location(player) != loc)
-move
+goto
-      break;
-    case TYPE_PLAYER:
@@ -459 +459 @@
-      /* Move the followers if the leader is elsewhere */
-      if (Location(player) != loc)
-move
+goto
-      break;
-    case TYPE_EXIT:

1.7.7/src/set.c

@@ -326 +326 @@
-    Owner(thing) = Owner(newowner);
-  }
-
+
+
+
+
+
+
+
+
+
+
+
+
+