Changeset 403

Timestamp:

08/12/06 06:06:58 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p2 Archival

Files:

• 1.7.7/CHANGES (modified) (1 diff)
• 1.7.7/INSTALL (modified) (1 diff)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/game/mushcnf.dst (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennflag.hlp (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennfunc.hlp (modified) (10 diffs)
• 1.7.7/game/txt/hlp/penntop.hlp (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennvers.hlp (modified) (4 diffs)
• 1.7.7/hdrs/conf.h (modified) (3 diffs)
• 1.7.7/hdrs/dbdefs.h (modified) (5 diffs)
• 1.7.7/hdrs/extchat.h (modified) (1 diff)
• 1.7.7/hdrs/externs.h (modified) (2 diffs)
• 1.7.7/hdrs/flags.h (modified) (1 diff)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/options.h.dist (modified) (1 diff)
• 1.7.7/src/bsd.c (modified) (9 diffs)
• 1.7.7/src/command.c (modified) (1 diff)
• 1.7.7/src/create.c (modified) (7 diffs)
• 1.7.7/src/db.c (modified) (9 diffs)
• 1.7.7/src/destroy.c (modified) (2 diffs)
• 1.7.7/src/extchat.c (modified) (4 diffs)
• 1.7.7/src/extmail.c (modified) (3 diffs)
• 1.7.7/src/flags.c (modified) (1 diff)
• 1.7.7/src/function.c (modified) (2 diffs)
• 1.7.7/src/fundb.c (modified) (41 diffs)
• 1.7.7/src/funstr.c (modified) (2 diffs)
• 1.7.7/src/game.c (modified) (2 diffs)
• 1.7.7/src/local.dst (modified) (5 diffs)
• 1.7.7/src/look.c (modified) (2 diffs)
• 1.7.7/src/parse.c (modified) (1 diff)
• 1.7.7/src/player.c (modified) (1 diff)
• 1.7.7/src/speech.c (modified) (1 diff)
• 1.7.7/src/tables.c (modified) (2 diffs)
• 1.7.7/src/warnings.c (modified) (1 diff)
• 1.7.7/src/wiz.c (modified) (1 diff)
• 1.7.7/utils/gentables.c (modified) (3 diffs)
• 1.7.7/utils/mkcmds.sh.SH (modified) (4 diffs)
• 1.7.7/win32/funs.h (modified) (1 diff)

1.7.7/CHANGES

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 2                      December 22, 2002
+
+Major Changes:
+  * The LOCAL_DATA define has been removed along with the pointer
+    in the object structure. The local functions called on creation,
+    destruction, and cloning are now always called. Objects can
+    now store data in a single hashtable using the set_objdata()
+    and get_objdata() functions. As a proof of concept, the transitory
+    channel lists on objects are now stored here, and the "channels"
+    pointer has been removed from the object structure. Design
+    and much of the implementation by Vadiv@M*U*S*H.
+Powers:
+  * can_nspemit power can be used to provide access to @nspemit
+    without a Wizard bit. [SW]
+Functions:
+  * lpos from Mux, TM3. [SW]
+Fixes:
+  * Fix to some gcc-specific macros reported by Peter Bengston and
+    Michael Holbrook. [SW]
+  * Improvements to stripaccents/noaccents conversions. [SW]
+  * Fixes from 1.7.6p3.
+
-
-Version 1.7.7 patchlevel 1                      December 17, 2002

1.7.7/INSTALL

@@ -121 +121 @@
-    ./Configure -d
-
-
+, try ./Configure -d, but if it fails, try
-    . Configure
-     (That's a single period, a space, and Configure)

1.7.7/Patchlevel

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

1.7.7/game/mushcnf.dst

@@ -163 +163 @@
-# which could be useful if your host limits your stack (it will prevent
-# a crash). The higher your allowed stack size limit, the larger the
-
-But remember that you need to recurse for every [ or { or function call
-in your code, and those add up quickly. So this must often be set quit
-high (e.g. 18000), alas
-10
+ Generally
+speaking, you won't ever see more than 8192 recursions, so that's
+probably an upper limit, but most sane code shouldn't need mor
+than a couple thousand
+5
-
-# The maximum number of milliseconds of CPU time that a single queue entry

1.7.7/game/txt/hlp/pennflag.hlp

@@ -419 +419 @@
-  $-commands; thus, any object which does not have $-commands on it should
-  be set NO_COMMAND. Many MUSHes choose to have all objects initially set
-
+ The flag has no effect on exits.
-
-  See also: USER-DEFINED COMMANDS

1.7.7/game/txt/hlp/pennfunc.hlp

@@ -46 +46 @@
-  Communication functions: Send messages to objects (PEMIT, OEMIT)
-  Dbref functions: return dbref info related to objects (LOC, LEXITS)
-  Floating point functions: floating point math (SIN, ROUND)
-  Global functions: local MUSH-specific functions defined with @function
+  Html functions: output html tags for Pueblo-compatible clients
-  Information functions:  find out something about objects (FLAGS, MONEY)
-  List functions:  manipulate lists (REVWORDS, FIRST)
@@ -109 +109 @@
-  on an object.
-  
-
-
-
+
+
+
+
-  pmatch()      rloc()        rnum()        room()        where()       
-  zone()
@@ -135 +136 @@
-  mailstats()   mailstatus()  mailsubject() mailtime()
-  
-& Floating point functions
-  Floating point functions operate on floating point numbers. Most of
-  them return a floating-point number as a result. Floating point
-  results can have at most 6 decimal places of precision.
- 
-  These functions only exist if floating point computation is enabled.
-  Check "@config" to see if they are.
- 
-  acos()        asin()        atan()        ceil()        cos()
-  e()           exp()         fdiv()        floor()       log()
-  ln()          pi()          power()       round()       sin()
-  sqrt()        tan()
- 
-& List functions
-  List functions take at least one list of elements and return transformed
@@ -160 +148 @@
-  replace()     rest()        revwords()    setdiff()     setinter()
-  setunion()    shuffle()     sort()        sortby()      splice()
-
+step()        table()       
-    
-  See also: LISTS
@@ -178 +166 @@
-  These functions operate only with floating point numbers:
-  acos()        asin()        atan()        atan2()       ceil()
-e()           exp()         fdiv()        floor()
-mod()        ln()          log()         pi()          power()
-
+ctu()         e()           exp()         fdiv()        
+loor()       fmod()        ln()          log()         pi()          
+power()       
-
-  These functions operate on n-dimensional vectors. A vector
@@ -205 +193 @@
-  ifelse()      lcstr()       left()        lit()         ljust()
-  merge()       mid()         ord()         pos()         regedit()
-regmatch()    repeat()      reverse()     right()       rjus
-scramble()    secure()      sha1()        space()       spellnum()    
-quish()      strcat()      strinsert()   stripaccent() stripansi()   
-len()      strmatch()    switch()      trim()        ucstr()       
-
+lpos()        regmatch()    repeat()      reverse()     righ
+rjust()       scramble()    secure()      sha1()        space()
+pellnum()    squish()      strcat()      strinsert()   stripaccents()
+ipansi()   strlen()      strmatch()    switch()      trim()
+ucstr()       
- 
-  See also: STRINGS
@@ -1671 +1659 @@
-  regardless of whether or not you have objects in it.
-
-con(), next
+lplayers(), con(), next(), lvcon
-& LCSTR()
-  lcstr(<string>)
@@ -1896 +1884 @@
-
-  See also: lvplayers(), lcon()
+& LPOS()
+  lpos(<string>, <character>)
+
+  This function returns a list of the positions where <character> occupies
+  in <string>, with te first character of the string being 0. Note that
+  this differs from the pos() function, but is consistent with other string
+  functions like mid() and delete().
+
+  If <character> is a null argument, space is used.
+  If <character> is not found anywhere in <string>, an empty list is 
+  returned.
+
+  Example:
+  > say lpos(a-bc-def-g, -)
+  You say, "1 4 8"
+
+  See also: pos()
-& LSEARCH()
-& SEARCH()
@@ -2296 +2301 @@
-  acts just like @name <object>=<new name>. Consequently, if renaming
-  a player, you must use the player's password or be God.
+
+  name() with no arguments currently returns nothing. This should be an
+  error, but enough old code has been written that expects this behavior
+  that it will continue to do this for the time being. Don't rely on it.
-
-  Related functions: FULLNAME(), INAME() 
@@ -3238 +3247 @@
-  See also: @tel
-& TEXTFILE()
+& dynhelp()
-  textfile(<type>,<entry>)
-

1.7.7/game/txt/hlp/penntop.hlp

@@ -966 +966 @@
-  tport_anywhere        Can @teleport to anywhere.
-  unkillable            Can not be killed
+  can_nspemit           Can use @nspemit and nspemit()
-
-  See also: @power

1.7.7/game/txt/hlp/pennvers.hlp

@@ -1 +1 @@
-& changes
-1
+2
-This is a list of changes in this patchlevel which are probably of
-interest to players. More information about new commands and functions
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.7.7 patchlevel 2                      December 22, 2002
+
+Major Changes:
+  * The LOCAL_DATA define has been removed along with the pointer
+    in the object structure. The local functions called on creation,
+    destruction, and cloning are now always called. Objects can
+    now store data in a single hashtable using the set_objdata()
+    and get_objdata() functions. As a proof of concept, the transitory
+    channel lists on objects are now stored here, and the "channels"
+    pointer has been removed from the object structure. Design
+    and much of the implementation by Vadiv@M*U*S*H.
+Powers:
+  * can_nspemit power can be used to provide access to @nspemit
+    without a Wizard bit. [SW]
+Functions:
+  * lpos from Mux, TM3. [SW]
+Fixes:
+  * Fix to some gcc-specific macros reported by Peter Bengston and
+    Michael Holbrook. [SW]
+  * Improvements to stripaccents/noaccents conversions. [SW]
+  * Fixes from 1.7.6p3.
+
+
+& 1.7.7p1
-Version 1.7.7 patchlevel 1                      December 17, 2002
-
@@ -547 +571 @@
-  * Indentation fixes [SW]
-  * Fixes up to 1.7.4p12 merged in.
+
+& 1.7.6p3
+Version 1.7.6 patchlevel 3                      December 22, 2002
+
+Minor changes:
+   * call_limit now controls the maximum recursion in process_expression,
+     instead of maximum calls to p_e per command cycle. This still
+     limits stack size, but doesn't get in the way of massive code
+     nearly as much. People using a very high call_limit value should
+     probably lower it significantly. Patch by Philip Mak.
+   * Improved error messages for many database information functions.
+     Notably, several functions that require at least one argument,
+     now complain if they don't get it rather than returning silently.
+     Suggested by Intrevis@M*U*S*H. [SW]
+Fixes:
+   * @warnings are no longer shown on GOING objects. Suggested by
+     Philip Mak.
+   * Help fixes by Intrevis, Time, and Ambrosia@M*U*S*H
+   * Bug in @decomp/skipdefaults reported by Philip Mak. [SW]
+   * Tweaks to utils/mkcmds.sh [SW]
+   * home() on a room acts as described in the help. Reported by
+     Intrevis@M*U*S*H. [SW]
+   * whisper/noisy double-notified the whisperer. Reported by Philip Mak.
+   * Crash bug in @mail fixed. Reported by Titan@OtherSpace.
+
-
-& 1.7.6p2
@@ -5826 +5875 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
-
+, 2
+, 3
-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/hdrs/conf.h

@@ -351 +351 @@
-/* Compiler-specific stuff. */
-
+#ifndef __GNUC_PREREQ
+#if defined __GNUC__ && defined __GNUC_MINOR__
+# define __GNUC_PREREQ(maj, min) \
+        ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+# define __GNUC_PREREQ(maj, min) 0
+#endif
+#endif
+
-/* For gcc 3 and up, this attribute lets the compiler know that the
- * function returns a newly allocated value, for pointer aliasing
- * optimizations.
- */
-
-
+
-#define __attribute_malloc__ __attribute__ ((__malloc__))
-se
+if !defined(__attribute_malloc__)
-#define __attribute_malloc__
-#endif
-#endif
-
@@ -369 +376 @@
- * This should be a Configure check sometime.
- */
-
+
+
+
-#define RESTRICT restrict
-#elif defined(__GNUC__)
-#define RESTRICT __restrict__
-#else
-#define RESTRICT
@@ -381 +388 @@
-#if defined(WIN32) && _MSC_VER >= 1200
-#define NORETURN __declspec(noreturn)
-_
+
-#define NORETURN __attribute__ ((__noreturn__))
-#else

1.7.7/hdrs/dbdefs.h

@@ -9 +9 @@
-#endif
-#include <time.h>
+#include "htab.h"
-
-extern int depth;
@@ -62 +63 @@
-
-#define AttrCount(x)    (db[(x)].attrcount)
-
-#ifdef LOCAL_DATA
-#define LocData(x)      (db[(x)].local_data)
-#endif
-
-/* Moved from warnings.c because create.c needs it. */
@@ -234 +231 @@
-  dbref zone;           /* zone master object number */
-  int penn;         /* number of pennies object contains */
-#ifdef CHAT_SYSTEM
-  CHANLIST *channels;
-#endif
-  int warnings;         /* bitflags of warning types */
-  time_t creation_time;     /* Time/date of object creation */
@@ -243 +237 @@
-                 * logins for players. */
-  int attrcount;        /* Number of attribs on the object */
-#ifdef LOCAL_DATA
-  void *local_data;
-#endif
-  object_flag_type flags;
-  object_flag_type toggles;
@@ -263 +254 @@
-extern struct object *db;
-extern dbref db_top;
+
+extern void *get_objdata(dbref thing, const char *keybase);
+extern void *set_objdata(dbref thing, const char *keybase, void *data);
+extern void clear_objdata(dbref thing);
-
-#define DOLIST(var, first)\

1.7.7/hdrs/extchat.h

@@ -92 +92 @@
-};
-
-
+
+
-
-/* Channel type flags and macros */

1.7.7/hdrs/externs.h

@@ -368 +368 @@
-
-    typedef struct {
-unsigned char 
+const char *
-      const char *entity;
-    } accent_info;
@@ -474 +474 @@
-    void local_connect(dbref player, int isnew, int num);
-    void local_disconnect(dbref player, int num);
-#ifdef LOCAL_DATA
-    void local_data_create(dbref object);
-    void local_data_clone(dbref clone, dbref source);
-    void local_data_free(dbref object);
-#endif
-
-/* funlist.c */

1.7.7/hdrs/flags.h

@@ -272 +272 @@
-#define LINK_ANYWHERE   0x20000000  /* Can @link an exit to any room */
-#define OPEN_ANYWHERE   0x40000000  /* Can @open an exit from any room */
+#define CAN_NSPEMIT     0x80000000  /* Can use @nspemit and nspemit() */
-
-/* These powers are obsolete, but are kept around to implement

1.7.7/hdrs/version.h

@@ -1 @@
-1 [12/17
-1
+2 [12/22
+2

1.7.7/options.h.dist

@@ -118 +118 @@
-/* #define MEM_CHECK /* */
-
-/* Defining this will add 4 bytes to every object in memory, and that is
- * the local_data void *pointer.
- * Usefull for local hackers, who can store stuff like skills, languages,
- * combat stats etc in a record this points to, and then store/reload it
- * in the local_* hooks.
- * If you are NOT one of those who modify the local C source extensivly,
- * this will be COMPLETELY worthless to you.
- */
-/* #define LOCAL_DATA /* */
-
-/* If defined, use the info_slave to get information from identd,
- * instead of having the MUSH do it directly.  This may help reduce lag

1.7.7/src/bsd.c

@@ -352 +352 @@
-void add_to_queue(struct text_queue *q, const char *b, int n);
-int flush_queue(struct text_queue *q, int n);
-
-
-
-
+
+
+
-static int queue_string_eol(DESC *d, const char *s);
-int process_output(DESC *d);
@@ -1064 +1063 @@
-      safe_str("\xFF\xFF", t, &o);
-    else if (strip)
-chr((char) 
+str(
-    else
-      safe_chr((char) IAC, t, &o);
@@ -1082 +1081 @@
-    break;
-      default:
-
-chr((char) 
+ && accent_table[(unsigned char) *p].base
+str(
-    else
-      safe_chr(*p, t, &o);
@@ -1205 +1204 @@
-          break;
-        default:
-
+
+
+
+
-          break;
-        }
@@ -1242 +1244 @@
-    if (type == NA_TANSI || type == NA_TCOLOR)
-      safe_str("\xFF\xFF", t, &o);
-
-ch
+ && accent_table[IAC].base
+st
-    else
-      safe_chr((char) IAC, t, &o);
@@ -1270 +1272 @@
-      ansi_change_state(t, &o, color, state, newstate);
-    }
-
-chr((char) 
+ && accent_table[(unsigned char) *p].base
+str(
-    else
-      safe_chr(*p, t, &o);
@@ -3072 +3074 @@
-}
-
-
+static 
-queue_write(DESC *d, const char *b, int n)
-{
@@ -3111 +3113 @@
-}
-
-
-
+static 
+unsigned 
-{
-  int space;
@@ -3220 +3222 @@
-}
-
-
+static 
-queue_string(DESC *d, const char *s)
-{

1.7.7/src/command.c

@@ -192 +192 @@
-  {"@NOTIFY", "ALL ANY", cmd_notify_drain, CMD_T_ANY | CMD_T_EQSPLIT, 0, 0, 0},
-  {"@NSPEMIT", "LIST SILENT NOISY NOEVAL", cmd_nspemit,
-0
+CAN_NSPEMIT
-  {"@NUKE", NULL, cmd_nuke, CMD_T_ANY | CMD_T_NOGAGGED, 0, 0, 0},
-

1.7.7/src/create.c

@@ -141 +141 @@
-    }
-    current_state.exits++;
-#ifdef LOCAL_DATA
-    local_data_create(new_exit);
-#endif
-    return new_exit;
-  }
@@ -359 +357 @@
-    }
-    current_state.rooms++;
-#ifdef LOCAL_DATA
-    local_data_create(room);
-#endif
-    if (tport) {
-      /* We need to use the full command, because we need NO_TEL
@@ -424 +420 @@
-    notify_format(player, "Created: Object %s.", unparse_dbref(thing));
-    current_state.things++;
-#ifdef LOCAL_DATA
-    local_data_create(thing);
-#endif
-    return thing;
-  }
@@ -442 +436 @@
-  memcpy(REFDB(clone), REFDB(thing), sizeof(struct object));
-  Owner(clone) = Owner(player);
-#ifdef CHAT_SYSTEM
-  Chanlist(clone) = NULL;
-#endif
-  Name(clone) = NULL;
-  if (newname && *newname)
@@ -519 +510 @@
-    moveto(clone, Location(player));
-      current_state.things++;
-#ifdef LOCAL_DATA
-      LocData(clone) = NULL;
-      local_data_clone(clone, thing);
-#endif
-      real_did_it(player, clone, NULL, NULL, NULL, NULL, "ACLONE", NOTHING,
-          wenv);
@@ -535 +523 @@
-      notify_format(player, T("Cloned: Room #%d."), clone);
-      current_state.rooms++;
-#ifdef LOCAL_DATA
-      LocData(clone) = NULL;
-      local_data_clone(clone, thing);
-#endif
-      real_did_it(player, clone, NULL, NULL, NULL, NULL, "ACLONE", NOTHING,
-          wenv);
@@ -589 +574 @@
-           ("Warning: @CLONE/PRESERVE on an exit with WIZ, ROY, @Powers, or Warnings."));
-      notify_format(player, T("Cloned: Exit #%d."), clone);
-#ifdef LOCAL_DATA
-      LocData(clone) = NULL;
-      local_data_clone(clone, thing);
-#endif
-      return clone;
-    }

1.7.7/src/db.c

@@ -29 +29 @@
-#include "strtree.h"
-#include "parse.h"
+#include "htab.h"
-#include "confmagic.h"
-
@@ -59 +60 @@
-
-dbref db_size = DB_INITIAL_SIZE;
+
+HASHTAB htab_objdata;
+HASHTAB htab_objdata_keys;
-
-extern char ccom[];
@@ -75 +79 @@
-int get_list(FILE * f, dbref i);
-void db_free(void);
+static void init_objdata_htab(int size);
-
-StrTree object_names;
@@ -157 +162 @@
-      o->toggles = 0;
-      o->powers = 0;
-#ifdef CHAT_SYSTEM
-      /* initialize channels here, since it's not going to get done otherwise */
-      o->channels = NULL;
-#endif
-      o->warnings = 0;
-      o->modification_time = o->creation_time = mudtime;
-#ifdef LOCAL_DATA
-      o->local_data = NULL;
-#endif
-      o->attrcount = 0;
-      initialized++;
@@ -199 +197 @@
-  o->toggles = 0;
-  o->powers = 0;
-#ifdef CHAT_SYSTEM
-  /* initialize channels here, since it's not going to get done otherwise */
-  o->channels = NULL;
-#endif
-  o->warnings = 0;
-  o->modification_time = o->creation_time = mudtime;
-#ifdef LOCAL_DATA
-  o->local_data = NULL;
-#endif
-  o->attrcount = 0;
-  if (current_state.garbage)
@@ -1193 +1184 @@
-    case '~':
-      db_init = (getref(f) * 3) / 2;
+      init_objdata_htab(db_init);
-      break;
-      /* Use the MUSH 2.0 header stuff to see what's in this db */
@@ -1313 +1305 @@
-      else
-    temp = 0;
-#ifdef CHAT_SYSTEM
-      o->channels = NULL;
-#endif              /* CHAT_SYSTEM */
-
-      /* If there are warnings in the db, read 'em in */
@@ -1347 +1336 @@
-    Toggles(i) &= ~PLAYER_CONNECT;
-      }
-#ifdef LOCAL_DATA
-      o->local_data = NULL;
-#endif
-      break;
-
@@ -1374 +1360 @@
-  }
-}
+
+static void
+init_objdata_htab(int size)
+{
+  hashinit(&htab_objdata, size, 4);
+  hashinit(&htab_objdata_keys, 8, 32);
+}
+
+void *
+set_objdata(dbref thing, const char *keybase, void *data)
+{
+  if (data) {
+    if (hashadd(tprintf("%s_#%d", keybase, thing), data, &htab_objdata) < 0)
+      return NULL;
+    if (hash_find(&htab_objdata_keys, keybase) == NULL) {
+      char *newkey = strdup(keybase);
+      hashadd(keybase, (void *) &newkey, &htab_objdata_keys);
+    }
+    return data;
+  } else {
+    hashdelete(tprintf("%s_#%d", keybase, thing), &htab_objdata);
+    return NULL;
+  }
+}
+
+void *
+get_objdata(dbref thing, const char *keybase)
+{
+  return hashfind(tprintf("%s_#%d", keybase, thing), &htab_objdata);
+}
+
+void
+clear_objdata(dbref thing)
+{
+  char *p;
+  /* Clear all data stored for this object. Used when the object is freed */
+  for (p = (char *) hash_firstentry(&htab_objdata_keys);
+       p; p = (char *) hash_nextentry(&htab_objdata_keys)) {
+    set_objdata(thing, p, NULL);
+  }
+}

1.7.7/src/destroy.c

@@ -577 +577 @@
-  if (!GoodObject(thing))
-    return;
-#ifdef LOCAL_DATA
-  local_data_free(thing);
-#endif
-  switch (Typeof(thing)) {
-  case TYPE_THING:
@@ -714 +712 @@
-  Exits(thing) = NOTHING;
-  Home(thing) = NOTHING;
+
+  clear_objdata(thing);
-
-  Next(thing) = first_free;

1.7.7/src/extchat.c

@@ -401 +401 @@
-  /* No channels? */
-  if (!Chanlist(who)) {
-Chanlist(who) = tmp
-Chanlist(who)->next = NULL
+tmp->next = NULL
+s_Chanlist(who, tmp)
-    return;
-  }
@@ -408 +408 @@
-  /* First channel? */
-  if (strcasecoll(ChanName(p->chan), ChanName(*ch)) > 0) {
-Chanlist(who) = tm
-Chanlist(who)->next = p
+tmp->next = 
+s_Chanlist(who, tmp)
-    return;
-  } else if (!strcasecmp(ChanName(p->chan), ChanName(*ch))) {
@@ -441 +441 @@
-  if (!ch)
-    return;
-  if (!Chanlist(who))
-    return;
-  p = Chanlist(who);
+  if (!p)
+    return;
-  if (p->chan == ch) {
-    /* First channel */
-Chanlist(who) = p->next
+s_Chanlist(who, p->next)
-    free_chanlist(p);
-    return;
@@ -2287 +2287 @@
-}
-
+
-#endif              /* CHAT_SYSTEM */

1.7.7/src/extmail.c

@@ -2535 +2535 @@
-  struct mail_alias *m;
-  int i;
-  char keepsub[BUFFER_LEN];
-
-  /* send a mail message to each player on an alias */
@@ -2548 +2547 @@
-    return 0;
-
-  strcpy(keepsub, uncompress(subject));
-
-  /* If they are not allowed to see the people on the alias, then
-   * we must treat this as a case of silent mailing.
@@ -2562 +2559 @@
-
-  for (i = 0; i < m->size; i++) {
-keepsub
+subject
-  }
-  return 1;         /* Success */

1.7.7/src/flags.c

@@ -187 +187 @@
-  {"Tport_Anywhere", TEL_ANYWHERE},
-  {"Unkillable", UNKILLABLE},
+  {"Can_nspemit", CAN_NSPEMIT},
-  {NULL, 0}
-};

1.7.7/src/function.c

@@ -298 +298 @@
-  {"LPARENT", fun_lparent, 1, 1, FN_REG},
-  {"LPLAYERS", fun_lplayers, 1, 1, FN_REG},
+  {"LPOS", fun_lpos, 2, 2, FN_REG},
-  {"LSEARCH", fun_lsearch, 1, 5, FN_REG},
-  {"LSEARCHR", fun_lsearch, 1, 5, FN_REG},
@@ -335 +336 @@
-  {"MUNGE", fun_munge, 3, 5, FN_REG},
-  {"MWHO", fun_lwho, 0, 0, FN_REG},
-1
+0
-  {"NAND", fun_nand, 1, INT_MAX, FN_REG},
-  {"NATTR", fun_nattr, 1, 1, FN_REG},

1.7.7/src/fundb.c

@@ -116 +116 @@
-
-  thing = match_thing(executor, args[0]);
-thing == NOTHING
-match
+!GoodObject(thing)
+notvis
-    return;
-  }
@@ -135 +135 @@
-  dbref thing;
-  thing = match_thing(executor, args[0]);
-thing == NOTHING
-match
+!GoodObject(thing)
+notvis
-    return;
-  }
@@ -153 +153 @@
-
-  thing = match_thing(executor, args[0]);
-thing == NOTHING
+!GoodObject(thing)
-    safe_str(T(e_notvis), buff, bp);
-    return;
@@ -187 +187 @@
-  *s++ = '\0';
-  thing = match_thing(executor, args[0]);
-thing == NOTHING
+!GoodObject(thing)
-    safe_str(T(e_notvis), buff, bp);
-    return;
@@ -203 +203 @@
-
-  thing = match_thing(executor, args[0]);
-thing == NOTHING
+!GoodObject(thing)
-    safe_str(T(e_notvis), buff, bp);
-    return;
@@ -253 +253 @@
-
-  thing = match_thing(executor, args[0]);
-thing == NOTHING
+!GoodObject(thing)
-    safe_str(T(e_notvis), buff, bp);
-    return;
@@ -295 +295 @@
-  *s++ = '\0';
-  thing = match_thing(executor, args[0]);
-thing == NOTHING
+!GoodObject(thing)
-    safe_str(T(e_notvis), buff, bp);
-    return;
@@ -424 +424 @@
-    *p++ = '\0';
-  thing = match_thing(executor, args[0]);
-thing == NOTHING
-"#-1"
+!GoodObject(thing)
+T(e_notvis)
-    return;
-  }
@@ -441 +441 @@
-  }
-}
+
+#ifdef WIN32
+#pragma warning( disable : 4761)    /* Disable bogus conversion warning */
+#endif
+/* ARGSUSED */
+FUNCTION(fun_haspower)
+{
+  dbref it;
+  object_flag_type pwr;
+
+  it = match_thing(executor, args[0]);
+  if (!GoodObject(it)) {
+    safe_str(T(e_notvis), buff, bp);
+    return;
+  }
+  if (HASPOWER_RESTRICTED)
+    if (!Can_Examine(executor, it)) {
+      notify(executor,
+         T("We could let you see that, but then we'd have to kill you."));
+      safe_str("#-1", buff, bp);
+      return;
+    }
+  pwr = find_power(args[1]);
+  if (pwr == -1)
+    safe_str(T("#-1 NO SUCH POWER"), buff, bp);
+  else
+    safe_boolean(Powers(it) & pwr, buff, bp);
+}
+
+/* ARGSUSED */
+FUNCTION(fun_powers)
+{
+  dbref it;
+
+  it = match_thing(executor, args[0]);
+  if (!GoodObject(it)) {
+&