Changeset 465

Timestamp:

08/16/06 01:12:13 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p33 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) (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/chunk.h (modified) (1 diff)
• 1.7.7/hdrs/command.h (modified) (1 diff)
• 1.7.7/hdrs/dbdefs.h (modified) (1 diff)
• 1.7.7/hdrs/extchat.h (modified) (2 diffs)
• 1.7.7/hdrs/externs.h (modified) (1 diff)
• 1.7.7/hdrs/extmail.h (modified) (1 diff)
• 1.7.7/hdrs/game.h (modified) (3 diffs)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/hints/darwin.sh (modified) (1 diff)
• 1.7.7/src/bsd.c (modified) (3 diffs)
• 1.7.7/src/bufferq.c (modified) (3 diffs)
• 1.7.7/src/chunk.c (modified) (2 diffs)
• 1.7.7/src/cmds.c (modified) (7 diffs)
• 1.7.7/src/cque.c (modified) (3 diffs)
• 1.7.7/src/extchat.c (modified) (12 diffs)
• 1.7.7/src/extmail.c (modified) (6 diffs)
• 1.7.7/src/flags.c (modified) (1 diff)
• 1.7.7/src/funstr.c (modified) (1 diff)
• 1.7.7/src/game.c (modified) (2 diffs)
• 1.7.7/src/log.c (modified) (1 diff)
• 1.7.7/src/look.c (modified) (4 diffs)
• 1.7.7/src/move.c (modified) (5 diffs)
• 1.7.7/src/mysocket.c (modified) (1 diff)
• 1.7.7/src/predicat.c (modified) (2 diffs)
• 1.7.7/src/rob.c (modified) (4 diffs)
• 1.7.7/src/version.c (modified) (1 diff)
• 1.7.7/src/wiz.c (modified) (7 diffs)
• 1.7.7/win32/config.h (modified) (1 diff)
• 1.7.7/win32/pennmush.dsp (modified) (2 diffs)

1.7.7/CHANGES.177

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 33                     June 3, 2004
+
+Minor changes (internals):
+  * IsPlayer, etc. macros rewritten for clarity by Luke@M*U*S*H.
+  * Use enums in place of some more #defines and magic numbers. [SW]
+  * New did_it_with() hc function simplifies passing a dbref as %0
+    to did_it actions. [SW]
+Fixes:
+  * The SQL_OK power could get double-added. If this happened to you,
+    delete one of them and double-check that all sql-using objects
+    still have the power set. Report by Mordie@M*U*S*H.
+  * Missing include in game.c fixed.
+  * Improper include in bufferq.c fixed. Report by Leona and Walker@M*U*S*H.
+  * Obsolete bzero() uses removed. [SW]
+  * New win32/pennmush.dsp.
+  * Help fix by bleeder@M*U*S*H.
+  * Mac OS X linting [SW].
+
-
-Version 1.7.7 patchlevel 32                     May 26, 2004

1.7.7/Patchlevel

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

1.7.7/game/txt/hlp/penncmd.hlp

@@ -2644 +2644 @@
-    or 'exit'. It defaults to 'any'. 
-  <setperms> specifies the space-separated list of permissions for who can
-power
+flag
-    It defaults to 'any'
-  <unsetperms> specifies the space-separated list of permissions for who

1.7.7/game/txt/hlp/pennv177.hlp

@@ -1 @@
-2
+3
-& 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 33                     June 3, 2004
+
+Minor changes (internals):
+  * IsPlayer, etc. macros rewritten for clarity by Luke@M*U*S*H.
+  * Use enums in place of some more #defines and magic numbers. [SW]
+  * New did_it_with() hc function simplifies passing a dbref as %0
+    to did_it actions. [SW]
+Fixes:
+  * The SQL_OK power could get double-added. If this happened to you,
+    delete one of them and double-check that all sql-using objects
+    still have the power set. Report by Mordie@M*U*S*H.
+  * Missing include in game.c fixed.
+  * Improper include in bufferq.c fixed. Report by Leona and Walker@M*U*S*H.
+  * Obsolete bzero() uses removed. [SW]
+  * New win32/pennmush.dsp.
+  * Help fix by bleeder@M*U*S*H.
+  * Mac OS X linting [SW].
+
+
+& 1.7.7p32
-Version 1.7.7 patchlevel 32                     May 26, 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,
-
+, 33
-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/chunk.h

@@ -23 +23 @@
-int chunk_num_swapped(void);
-void chunk_init(void);
-
+
+
+
+
-void chunk_new_period(void);
-

1.7.7/hdrs/command.h

@@ -7 +7 @@
-#define SW_CLR(m,n)     (m[(n) >> 3] &= ~(1 << ((n) & 0x7)))
-#define SW_ISSET(m,n)   (m[(n) >> 3] & (1 << ((n) & 0x7)))
-bzero(m
+memset(m, 0
-
-/* These are type restrictors */

1.7.7/hdrs/dbdefs.h

@@ -63 +63 @@
-
-/* Check for a specific one */
-!!(Typeof(x) & TYPE_PLAYER)
-!!(Typeof(x) & TYPE_ROOM)
-!!(Typeof(x) & TYPE_THING)
-!!(Typeof(x) & TYPE_EXIT)
+(Typeof(x) & TYPE_PLAYER) == TYPE_PLAYER
+(Typeof(x) & TYPE_ROOM) == TYPE_ROOM
+(Typeof(x) & TYPE_THING) == TYPE_THING
+(Typeof(x) & TYPE_EXIT) == TYPE_EXIT
-/* Was Destroyed() */
-!!(Typeof(x) & TYPE_GARBAGE)
-!!(db[(x)].type & TYPE_MARKED)
+(Typeof(x) & TYPE_GARBAGE) == TYPE_GARBAGE
+(db[(x)].type & TYPE_MARKED) == TYPE_MARKED
-
-#define IS(thing,type,flag) \

1.7.7/hdrs/extchat.h

@@ -205 +205 @@
-
-     /* For use in channel matching */
-
-
-
-
+
-#define CMATCHED(i) (((i) == CMATCH_EXACT) | ((i) == CMATCH_PARTIAL))
-
@@ -239 +236 @@
-extern void do_chan_admin
-  (dbref player, char *name, const char *perms, int flag);
-
-
+
+
+
-extern void do_channel_list(dbref player, const char *partname);
-extern int do_chat_by_name

1.7.7/hdrs/externs.h

@@ -291 +291 @@
-          const char *def, const char *owhat, const char *odef,
-          const char *awhat, dbref loc);
+extern int did_it_with(dbref player, dbref thing, const char *what,
+               const char *def, const char *owhat, const char *odef,
+               const char *awhat, dbref loc, dbref env0, dbref env1,
+               int flags);
-extern int did_it_interact(dbref player, dbref thing, const char *what,
-               const char *def, const char *owhat,

1.7.7/hdrs/extmail.h

@@ -82 +82 @@
-extern int mdb_top;
-extern void do_mail(dbref player, char *arg1, char *arg2);
-
+
+
-extern void do_mail_debug(dbref player, const char *action, const char *victim);
-extern void do_mail_nuke(dbref player);

1.7.7/hdrs/game.h

@@ -32 +32 @@
-extern void do_wait
-  (dbref player, dbref cause, char *arg1, char *cmd, int until);
-
+
+
-extern void do_halt1(dbref player, const char *arg1, const char *arg2);
-extern void do_allhalt(dbref player);
@@ -63 +64 @@
-
-/* From look.c */
-
+
+
+
-extern void do_inventory(dbref player);
-extern void do_find(dbref player, const char *name, char **argv);
@@ -160 +163 @@
-extern void do_newpassword
-  (dbref player, const char *name, const char *password);
-
+
+
-extern void do_chzoneall(dbref player, const char *name, const char *target);
-extern int force_by_number(dbref player, char *command);

1.7.7/hdrs/version.h

@@ -1 @@
-
-
-
+
+
+
+

1.7.7/hints/darwin.sh

@@ -1 +1 @@
-usenm="n"
-cdecl=''
-
+

1.7.7/src/bsd.c

@@ -1671 +1671 @@
-/* ARGSUSED */
-static DESC *
-
+
+
-{
-  DESC *d;
@@ -2558 +2559 @@
-/* ARGSUSED */
-static int
-
+ __attribute__ ((__unused__))
-{
-  int got = 0;
@@ -3387 +3388 @@
-  queue_string_eol(call_by, tprintf("Connected: %d", count));
-  queue_string_eol(call_by, tprintf("Size: %d", db_top));
-", SHORTVN
+p%s", VERSION, PATCHLEVEL
-#ifdef PATCHES
-  queue_string_eol(call_by, tprintf("Patches: %s", PATCHES));

1.7.7/src/bufferq.c

@@ -17 +17 @@
-#include <stddef.h>
-#include <stdarg.h>
+#include <stdlib.h>
-#ifdef I_SYS_TIME
-#include <sys/time.h>
@@ -24 +25 @@
-#include <sys/types.h>
-#endif
-#include <malloc.h>
-
-#include "conf.h"
@@ -31 +31 @@
-#include "dbdefs.h"
-#include "bufferq.h"
+#include "mymalloc.h"
-#include "log.h"
-#include "confmagic.h"

1.7.7/src/chunk.c

@@ -220 +220 @@
-
-#include <string.h>
+#include <stdlib.h>
-
-#include <fcntl.h>
@@ -2629 +2630 @@
- * Display either the statistics summary or one of the histograms.
- * \param player the player to display it to, or NOTHING to log it.
-
-
-
+
- */
-void
-int
+enum chunk_stats_type
-{
-  switch (which) {
-0
+CSTATS_SUMMARY
-    chunk_statistics(player);
-    break;
-1
+CSTATS_REGIONG
-    chunk_histogram(player, chunk_regionhist(),
-            "Chart number of regions (y) vs. references (x)");
-    break;
-2
+CSTATS_PAGINGG
-    chunk_histogram(player, stat_paging_histogram,
-            "Chart pages in/out (y) vs. references (x)");
-    break;
-3
+CSTATS_FREESPACEG
-    chunk_histogram(player, chunk_freehist(),
-            "Chart region free space (y) vs. references (x)");
-    break;
-4
+CSTATS_REGION
-    chunk_region_statistics(player);
-    break;
-5
+CSTATS_PAGING
-    chunk_page_stats(player);
-    break;

1.7.7/src/cmds.c

@@ -84 +84 @@
-COMMAND (cmd_boot) {
-  if (SW_ISSET(sw, SWITCH_PORT))
-1
+BOOT_DESC
-  else if (SW_ISSET(sw, SWITCH_ME))
-2
-
-0
+BOOT_SELF
+
+BOOT_NAME
-}
-
@@ -159 +159 @@
-
-COMMAND (cmd_create) {
-atol
+parse_integer
-}
-
@@ -474 +474 @@
-  /* First, mail commands that can be used even if you're gagged */
-  if (SW_ISSET(sw, SWITCH_STATS))
-0
+MSTATS_COUNT
-  else if (SW_ISSET(sw, SWITCH_DSTATS))
-1
+MSTATS_READ
-  else if (SW_ISSET(sw, SWITCH_FSTATS))
-2
+MSTATS_SIZE
-  else if (SW_ISSET(sw, SWITCH_DEBUG))
-    do_mail_debug(player, arg_left, arg_right);
@@ -671 +671 @@
-COMMAND (cmd_ps) {
-  if (SW_ISSET(sw, SWITCH_ALL))
-1
+QUEUE_ALL
-  else if (SW_ISSET(sw, SWITCH_SUMMARY) || SW_ISSET(sw, SWITCH_COUNT))
-2
+QUEUE_SUMMARY
-  else if (SW_ISSET(sw, SWITCH_QUICK))
-3
-
-0
+QUEUE_QUICK
+
+QUEUE_NORMAL
-}
-
@@ -793 +793 @@
-  else if (SW_ISSET(sw, SWITCH_CHUNKS)) {
-    if (SW_ISSET(sw, SWITCH_REGIONS))
-4
+CSTATS_REGION
-    else
-0
+CSTATS_SUMMARY
-  } else if (SW_ISSET(sw, SWITCH_REGIONS))
-1
+CSTATS_REGIONG
-  else if (SW_ISSET(sw, SWITCH_PAGING))
-2
+CSTATS_PAGINGG
-  else if (SW_ISSET(sw, SWITCH_FREESPACE))
-3
+CSTATS_FREESPACEG
-  else
-    do_stats(player, arg_left);
@@ -919 +919 @@
-
-COMMAND (cmd_brief) {
-1
+EXAM_BRIEF
-}
-
@@ -929 +929 @@
-  int all = SW_ISSET(sw, SWITCH_ALL);
-  if (SW_ISSET(sw, SWITCH_BRIEF))
-1
+EXAM_BRIEF
-  else if (SW_ISSET(sw, SWITCH_DEBUG))
-    do_debug_examine(player, arg_left);
-  else if (SW_ISSET(sw, SWITCH_MORTAL))
-2
-
-0
+EXAM_MORTAL
+
+EXAM_NORMAL
-}
-

1.7.7/src/cque.c

@@ -894 +894 @@
- */
-void
-int
+enum queue_type
-{
-  dbref victim = NOTHING;
@@ -902 +902 @@
-  int pq = 0, oq = 0, wq = 0, sq = 0;
-  int tpq = 0, toq = 0, twq = 0, tsq = 0;
-2 || flag == 3
+QUEUE_SUMMARY || flag == QUEUE_QUICK
-    quick = 1;
-1 || flag == 2
+QUEUE_ALL || flag == QUEUE_SUMMARY
-    all = 1;
-    victim = player;
@@ -928 +928 @@
-
-    if (!quick) {
-1
+QUEUE_ALL
-    notify(player, T("Queue for : all"));
-      else

1.7.7/src/extchat.c

@@ -65 +65 @@
-static int yesno(const char *str);
-static int canstilladd(dbref player);
-
-
-
+
+
+
+
-static char *list_cflags(CHAN *c);
-static char *list_cuflags(CHANUSER *u);
@@ -150 +151 @@
-      list_partial_matches(player, name, PMATCH_ALL); \
-      return; \
+    default: \
+      break; \
-     } \
-    } while (0)
@@ -688 +691 @@
- * \retval CMATCH_NONE no match for channel name.
- */
-
+
-find_channel(const char *name, CHAN **chan, dbref player)
-{
@@ -743 +746 @@
- * \retval CMATCH_NONE no match for channel name.
- */
-
+
-find_channel_partial(const char *name, CHAN **chan, dbref player)
-{
@@ -830 +833 @@
- * \retval CMATCH_NONE no match for channel name.
- */
-int
+enum cmatch_type
-find_channel_partial_on(const char *name, CHAN **chan, dbref player)
-{
@@ -879 +882 @@
- * \retval CMATCH_NONE no match for channel name.
- */
-int
+enum cmatch_type
-find_channel_partial_off(const char *name, CHAN **chan, dbref player)
-{
@@ -1110 +1113 @@
-    list_partial_matches(player, name, PMATCH_OFF);
-    return;
+  default:
+    break;
-  }
-  if (!Chan_Can_See(chan, player)) {
@@ -1172 +1177 @@
-    list_partial_matches(player, name, PMATCH_ON);
-    return;
+  default:
+    break;
-  }
-  u = onchannel(player, chan);
@@ -1397 +1404 @@
-    list_partial_matches(player, name, PMATCH_ALL);
-    return;
+  default:
+    break;
-  }
-  if (!Chan_Can_See(chan, player)) {
@@ -2427 +2436 @@
-  CHAN *chan = NULL;
-  CHANUSER *u;
-  int i;
-  dbref who;
-
-i
+
+find_channel(args[0], &chan, executor)
-  case CMATCH_NONE:
-    notify(executor, T("No such channel."));
@@ -2437 +2445 @@
-    notify(executor, T("I can't tell which channel you mean."));
-    return;
+  default:
+    break;
-  }
-
@@ -2686 +2696 @@
-    safe_str("#-2 AMBIGUOUS CHANNEL MATCH", buff, bp);
-    return;
+  default:
+    break;
-  }
-

1.7.7/src/extmail.c

@@ -1222 +1222 @@
- * \param player the enactor.
- * \param name name of player whose mail stats are to be checked (NULL for all)
-
-
+
+
+
- */
-void
-int
+enum mail_stats_type
-{
-  dbref target;
@@ -1272 +1273 @@
-  }
-  if (target == AMBIGUOUS) {    /* stats for all */
-0
+MSTATS_COUNT
-      notify_format(player,
-            T("There are %d messages in the mail spool."), mdb_top);
-      return;
-1
+MSTATS_READ
-      for (mp = HEAD; mp != NULL; mp = mp->next) {
-    if (Cleared(mp))
@@ -1319 +1320 @@
-  /* individual stats */
-
-0
+MSTATS_COUNT
-    /* just count number of messages */
-    for (mp = HEAD; mp != NULL; mp = mp->next) {
@@ -1340 +1341 @@
-      else
-    fu++;
-2
+MSTATS_SIZE
-    fchars += strlen(get_message(mp));
-    }
@@ -1352 +1353 @@
-      else
-    tu++;
-2
+MSTATS_SIZE
-    tchars += strlen(get_message(mp));
-    }
@@ -1359 +1360 @@
-  notify_format(player, T("Mail statistics for %s:"), Name(target));
-
-1
+MSTATS_READ
-    notify_format(player, T("%d messages sent, %d unread, %d cleared."),
-          fc + fr + fu, fu, fc);

1.7.7/src/flags.c

@@ -1766 +1766 @@
-  Flagspace_Lookup(n, ns);
-  /* Don't double-add */
-name
+strupper(name)
-    return f;
-  f = new_flag();

1.7.7/src/funstr.c

@@ -661 +661 @@
-  char rawstr[BUFFER_LEN];
-  char *ip, *op;
-in
+size_
-  char *c;
-  ansi_string *as;

1.7.7/src/game.c

@@ -35 +35 @@
-#endif
-#include <stdlib.h>
+#include <stdarg.h>
-#ifdef I_UNISTD
-#include <unistd.h>
@@ -529 +530 @@
-
-  mush_panic(c);
+  _exit(136);           /* Not reached but kills warnings */
-}
-

1.7.7/src/log.c

@@ -16 +16 @@
-#include <string.h>
-#include <stdarg.h>
+#include <stdlib.h>
-#ifdef I_SYS_TIME
-#include <sys/time.h>

1.7.7/src/look.c

@@ -673 +673 @@
- */
-void
-int brief
+enum exam_type flag
-{
-  dbref thing;
@@ -715 +715 @@
-    return;
-  }
-brief == 2
+flag == EXAM_MORTAL
-    ok = 0;
-  } else {
@@ -743 +743 @@
-      notify(player, flag_description(player, thing));
-  }
-brief != 1
+flag != EXAM_BRIEF
-    a = atr_get_noparent(thing, "DESCRIBE");
-    if (a) {
@@ -781 +781 @@
-
-  /* show attributes */
-brief
-0:  
+flag
+EXAM_NORMAL:
-    if (EX_PUBLIC_ATTRIBS || ok)
-      look_atrs(player, thing, NULL, all);
-    break;
-1:  
-
-2:  
+EXAM_BRIEF:
+
+EXAM_MORTAL:
-    if (EX_PUBLIC_ATTRIBS)
-      mortal_look_atrs(player, thing, NULL, all);

1.7.7/src/move.c

@@ -515 +515 @@
-  long match_flags =
-    MAT_NEIGHBOR | MAT_ABSOLUTE | MAT_CHECK_KEYS | MAT_NEAR | MAT_ENGLISH;
-
-
+
-  if (!IsRoom(loc) && !EnterOk(loc) && !controls(player, loc)) {
-    notify(player, T("Permission denied."));
@@ -568 +567 @@
-    did_it(player, thing, "SUCCESS", tbuf1, "OSUCCESS", tbuf2, "ASUCCESS",
-           NOTHING);
-
-
-
-
-
-
-
+
+
-      } else
-    fail_lock(player, thing, Basic_Lock,
@@ -615 +609 @@
-      did_it(player, thing, "SUCCESS", tbuf1, "OSUCCESS", tbuf2,
-         "ASUCCESS", NOTHING);
-
-
-
-
-
-
-
+
+
-    } else
-      fail_lock(player, thing, Basic_Lock, T("You can't pick that up."),
@@ -775 +764 @@
-    /* Now do the work, if we should. That includes triggering messages */
-    if (empty_ok) {
-      int i;
-      char tbuf1[BUFFER_LEN], tbuf2[BUFFER_LEN], *tp;
-
+
-      count++;
-      /* Get messages */
@@ -794 +782 @@
-    did_it(player, item, "SUCCESS", tbuf1, "OSUCCESS", tbuf2, "ASUCCESS",
-           NOTHING);
-
-
-
-
-
-
-
+
+
-      }
-      /* Drop messages */

1.7.7/src/mysocket.c

@@ -994 +994 @@
-
-  if (hintsp == NULL) {
-bzero(&hints
+memset(&hints, 0
-    hints.ai_family = AF_UNSPEC;
-  } else

1.7.7/src/predicat.c

@@ -152 +152 @@
-{
-  /* Bunch o' nulls */
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+NULL
-  return real_did_it(player, thing, what, def, owhat, odef, awhat, loc, myenv,
-             NA_INTER_HEAR);
+}
+
+/** A wrapper for real_did_it that can set %0 and %1 to dbrefs.
+ * \param player the enactor.
+ * \param thing object being triggered.
+ * \param what message attribute for enactor.
+ * \param def default message to enactor.
+ * \param owhat message attribute for others.
+ * \param odef default message to others.
+ * \param awhat action attribute to trigger.
+ * \param loc location in which action is taking place.
+ * \param env0 dbref to pass as %0, or NOTHING.
+ * \param env1 dbref to pass as %1, or NOTHING.
+ * \param flags interaction flags to pass to real_did_it.
+ * \retval 0 no attributes were present, only defaults were used if given.
+ * \retval 1 some attributes were evaluated and used.
+ */
+int
+did_it_with(dbref player, dbref thing, const char *what, const char *def,
+        const char *owhat, const char *odef, const char *awhat,
+        dbref loc, dbref env0, dbref env1, int flags)
+{
+  char *myenv[10] = { NULL };
+  char e0[SBUF_LEN], e1[SBUF_LEN], *ep;
+
+  if (env0 != NOTHING) {
+    ep = e0;
+    safe_dbref(env0, e0, &ep);
+    *ep = '\0';
+    myenv[0] = e0;
+  }
+
+  if (env1 != NOTHING) {
+    ep = e1;
+    safe_dbref(env1, e1, &ep);
+    *ep = '\0';
+    myenv[1] = e1;
+  }
+
+  return real_did_it(player, thing, what, def, owhat, odef, awhat, loc, myenv,
+             flags);
-}
-
@@ -177 +218 @@
-{
-  /* Bunch o' nulls */
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+NULL
-  return real_did_it(player, thing, what, def, owhat, odef, awhat, loc, myenv,
-             flags);

1.7.7/src/rob.c

@@ -146 +146 @@
-  char tbuf1[BUFFER_LEN];
-  char *bp;
-  char *myenv[10];
-  int i;
-
-  /* If we have a recipient, but no amnt, try parsing for
@@ -211 +209 @@
-
-    /* Notify the giver with their GIVE message */
-    myenv[0] = (char *) mush_malloc(BUFFER_LEN, "dbref");
-    myenv[1] = (char *) mush_malloc(BUFFER_LEN, "dbref");
-    sprintf(myenv[0], "#%d", thing);
-    sprintf(myenv[1], "#%d", who);
-    for (i = 2; i < 10; i++)
-      myenv[i] = NULL;
-    bp = tbuf1;
-    safe_format(tbuf1, &bp, T("You gave %s to %s."), Name(thing),
-            Name(who));
-    *bp = '\0';
-real_did_it
-myenv
+did_it_with
+thing, who
-
-    /* Notify the object that it's been given */
@@ -234 +226 @@
-            Name(thing));
-    *bp = '\0';
-
-
-
-
-
-
+
+
-      } else
-    notify(player, T("Permission denied."));
@@ -268 +256 @@
-    notify_format(player, T("You don't have that many %s to give!"), MONIES);
-  } else {
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+NULL
-    char paid[SBUF_LEN], *pb;
-

1.7.7/src/version.c

@@ -42 +42 @@
-  notify_format(player, T("Last restarted: %s"), buff);
-
-
+
+
-#ifdef PATCHES
-  notify_format(player, "Patches: %s", PATCHES);

1.7.7/src/wiz.c

@@ -741 +741 @@
- * \param player the enactor.
- * \param name name of the player or descriptor to boot.
-0=normal, 1=boot by descriptor, 2=self-boot
+the type of booting to do.
- */
-void
-int
+enum boot_type
-{
-  dbref victim;
@@ -751 +751 @@
-  victim = NOTHING;
-  switch (flag) {
-2
+BOOT_SELF
-    /* self boot */
-    victim = player;
-    break;
-1
+BOOT_DESC
-    /* boot by descriptor */
-    victim = find_player_by_desc(atoi(name));
-    if (victim == player)
-2
+BOOT_SELF
-    else if (victim == NOTHING) {
-      d = port_desc(atoi(name));
@@ -769 +769 @@
-    }
-    break;
-0
+BOOT_NAME
-    /* boot by name */
-    if ((victim =
@@ -778 +778 @@
-    }
-    if (victim == player)
-2
+BOOT_SELF
-    break;
-  }
@@ -792 +792 @@
-  /* look up descriptor */
-  switch (flag) {