Changeset 477

Timestamp:

08/16/06 01:31:08 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p39 Archival

Files:

• 1.7.7/CHANGES.177 (modified) (1 diff)
• 1.7.7/MANIFEST (modified) (2 diffs)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/game/mushcnf.dst (modified) (3 diffs)
• 1.7.7/game/restrictcnf.dst (modified) (4 diffs)
• 1.7.7/game/txt/hlp/penncmd.hlp (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennfunc.hlp (modified) (9 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/atr_tab.h (modified) (4 diffs)
• 1.7.7/hdrs/boolexp.h (modified) (1 diff)
• 1.7.7/hdrs/command.h (modified) (1 diff)
• 1.7.7/hdrs/compile.h (modified) (1 diff)
• 1.7.7/hdrs/dbio.h (added)
• 1.7.7/hdrs/externs.h (modified) (2 diffs)
• 1.7.7/hdrs/game.h (modified) (2 diffs)
• 1.7.7/hdrs/mushdb.h (modified) (1 diff)
• 1.7.7/hdrs/mushtype.h (modified) (1 diff)
• 1.7.7/hdrs/parse.h (modified) (1 diff)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/hints/freebsd_5.sh (added)
• 1.7.7/src/Makefile.SH (modified) (1 diff)
• 1.7.7/src/atr_tab.c (modified) (1 diff)
• 1.7.7/src/attrib.c (modified) (1 diff)
• 1.7.7/src/boolexp.c (modified) (6 diffs)
• 1.7.7/src/bsd.c (modified) (16 diffs)
• 1.7.7/src/cmds.c (modified) (1 diff)
• 1.7.7/src/command.c (modified) (10 diffs)
• 1.7.7/src/conf.c (modified) (1 diff)
• 1.7.7/src/cque.c (modified) (2 diffs)
• 1.7.7/src/db.c (modified) (42 diffs)
• 1.7.7/src/extchat.c (modified) (14 diffs)
• 1.7.7/src/extmail.c (modified) (2 diffs)
• 1.7.7/src/flags.c (modified) (12 diffs)
• 1.7.7/src/function.c (modified) (1 diff)
• 1.7.7/src/fundb.c (modified) (2 diffs)
• 1.7.7/src/funlist.c (modified) (2 diffs)
• 1.7.7/src/funstr.c (modified) (8 diffs)
• 1.7.7/src/game.c (modified) (6 diffs)
• 1.7.7/src/local.dst (modified) (2 diffs)
• 1.7.7/src/look.c (modified) (3 diffs)
• 1.7.7/src/malias.c (modified) (1 diff)
• 1.7.7/src/parse.c (modified) (1 diff)
• 1.7.7/src/player.c (modified) (1 diff)
• 1.7.7/src/rob.c (modified) (3 diffs)
• 1.7.7/src/services.c (modified) (3 diffs)
• 1.7.7/src/set.c (modified) (7 diffs)
• 1.7.7/src/utils.c (modified) (1 diff)
• 1.7.7/src/version.c (modified) (2 diffs)
• 1.7.7/src/warnings.c (modified) (5 diffs)
• 1.7.7/win32/cmds.h (modified) (1 diff)

1.7.7/CHANGES.177

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 39                     October 25, 2004
+
+Major Changes:
+  * Game and chat database formats have been rewritten. They are 
+    much more human-readable, can be extended with new fields
+    without using versioning flags, and provide better detection
+    and reporting of malformed databases. [SW]
+  * Chunk deref counts for locks are now stored in the database. [SW]
+Commands:
+  * New 'buy' command for purchasing items from vendors that can offer
+    multiple items at multiple prices. Patch by Walker@M*U*S*H.
+  * restrict_command and @command/restrict can now include an
+    error message to be sent when the player can't use the command,
+    which supercedes more generic errors. Suggested by Philip Mak.
+    Patch by Walker@M*U*S*H.
+Functions:
+  * lwho() can take an argument to produce the who list from that
+    player's viewpoint. Patch by Walker@M*U*S*H.
+Fixes:
+  * nattr(obj/attrib) returns 1 when matching a non-wildcarded attrib.
+    Report by Impster@M*U*S*H.
+  * +chan <msg> is now converted to @chat <chan>=<msg> (with noeval)
+    so @chat hooks apply to +chatting too. Patch by Walker@M*U*S*H.
+  * You must be able to locate a player to perform elock() on them.
+    Report by Ambrosia.
+  * Help fixes by Sketch@M*U*S*H.
+  * Simplification of @version code. [SW]
+  * cemit() restrictions are now based on those of @cemit, instead
+    of @emit. Report by BlackPhyr.
+  * Setting queue_loss to 0 disables queue_loss. A bad idea, but
+    more consistent behavior. Suggested by K Moon.
+  * Examining objects always shows their actual number of coins,
+    whether or not they're admin or no_pay.
+  * Code cleanup in @edit and in char routines. [SW].
+  * Wrong object checked when reporting money as unlimited. Report
+    by Nate Barney. [EEH]
+  * New hints/freebsd_5.sh. Suggested by James Lang.
+  * INFO command once again reports the server as "PennMUSH",
+    not just a version number. Report by Mark Hassman.
+  * Win32 linting. Builds with NT_TCP should work again (although
+    @shutdown/reboot under NT_TCP is still not functional). 
+    Reorganization of the Win32 services macros. [EEH]
+  * Fix to bug with login attempts using literal encrypted strings.
+    Reported by Cadar and Mirrador.
+  * @ps/all shows the right label on top. Patch by qa'toq@bDv.
+
-
-Version 1.7.7 patchlevel 38                     August 25, 2004

1.7.7/MANIFEST

@@ -23 +23 @@
-hdrs/copyrite.h
-hdrs/dbdefs.h
+hdrs/dbio.h
-hdrs/extchat.h
-hdrs/externs.h
@@ -140 +141 @@
-hints/dec_osf.sh
-hints/freebsd.sh
+hints/freebsd_5.sh
-hints/hpux.sh
-hints/hpux-gcc.sh

1.7.7/Patchlevel

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

1.7.7/game/mushcnf.dst

@@ -261 +261 @@
-function_invocation_limit 2500
-
-number of times
+depth
-# for a single expression. This limits how much the stack size can increase,
-# which could be useful if your host limits your stack (it will prevent
@@ -268 +268 @@
-# speaking, you won't ever see more than 8192 recursions, so that's
-# probably an upper limit, but most sane code shouldn't need more
-thousan
-50
+hundre
+1
-
-# The maximum number of milliseconds of CPU time that a single queue entry
@@ -342 +342 @@
-
-# One out of how many commands that are queued will cost the
-
+
+
+
-queue_loss 63
-

1.7.7/game/restrictcnf.dst

@@ -1 +1 @@
-#
-# Commands to restrict
-
+ [" <error message>]
-#         restrict_function <function> <restriction>
-# <restriction> is a space separated list that may include:
@@ -18 +18 @@
-#   !<restriction>  The opposite of a restriction (Command only).
-#       nosidefx        The side-effect version of a function won't work (Function only).
+#
+# If <error message> is given to a restrict_command, it is sent to the player
+# instead of a more generic, typically useless error message.
-#
-# Command restrictions typically also apply to side-effect functions that
@@ -58 +61 @@
-
-# Uncomment to allow only admin or @powered builders to build
-
-
+ " You need the builder power to do that.
+ " You need the builder power to do that.
-
-# Uncomment to disallow them to create objects
-
+ " You need the builder power to do that.
-
-# Used to be player_locate
@@ -68 +71 @@
-
-# Used to be hate_dest
-
+ " Use @recycle instead
-
-# Used to be cemit_power
-
+ " You can't @cemit without cemit @power
-
-# Turn off ansi().

1.7.7/game/txt/hlp/penncmd.hlp

@@ -3746 +3746 @@
-  
-See also: @lock, ENTER_OK, give, drop, @success, inventory
+& @abuy
+  @abuy <object> = <action list>
+
+  Sets the actions to be taken after a player buys an item
+  from PRICELIST. The item purchased is passed in as %0,
+  and the amount paid as %1
+
+  See also: buy, @buy, @obuy, @pricelist, MONEY, ACTION LISTS
+& @buy
+  @buy <object> [=<message>]
+
+  Sets the message that is shown to anyone who buys something from
+  the object, using the 'buy' command. The item purchased is passed
+  in as %0, and the amount paid as %1.
+
+  See also: buy, @abuy, @obuy, @pricelist, MONEY
+& @obuy
+  @obuy <object> [=<message>]
+
+  Sets the message that will be show to others whenever someone buys
+  an item from the object's PRICELIST using the 'buy' command. The
+  name of the person giving the money will be automatically inserted at
+  the beginning of the message. The item purchased is passed in as %0,
+  and the amount paid as %1.
+
+  See also: buy, @abuy, @obuy, @pricelist, MONEY
+& @pricelist
+  @pricelist <object>=<item1>:<price1>[,<price2>][ <item2>:...]
+
+  The PRICELIST attribute is a space-delimited list of item names
+  and prices that are checked when the 'buy' command is run.
+  
+  An item name may have '_'s where the player would use a space in
+  the name.
+
+  A price is either a number (20), a range of numbers (10-30), or
+  a minimum number (10+).
+
+  ex:
+    @PRICELIST vendor=mansion:1000+ large_house:100-200 house:20,30,50
+
+  See also: buy, @abuy, @buy, @obuy, MONEY
+& buy
+  buy <item>[ from <vendor>][ for <cost>]
+
+  When you try buying an item, PRICELIST attributes on nearby objects
+  (or <vendor> if given) will be checked for matching item:costs. If
+  <cost> is given, the first item that matches that cost will be purchased.
+  Otherwise, the first matching item that you can afford will be purchased.
+
+  If the pricelist match contains a list of prices,
+  ITEM:30,20,10, the first one you can afford will be the resulting price.
+
+  ex:
+  > &PRICELIST vendor=coke:20 pepsi:20
+  > &drink.coke vendor=You enjoy a delicious coke.
+  > &drink.pepsi vendor=It tastes like a funny coke.
+  > @BUY vendor=u(drink.%0)
+  > buy coke
+  You enjoy a delicious coke.
+
+  See also: @ABUY, @BUY, @PRICELIST
-& give
-  give[/silent] <player>=<number>

1.7.7/game/txt/hlp/pennfunc.hlp

@@ -177 +177 @@
-  numbers, they will return an error or misbehave):
-  dec()         div()         floordiv()    inc()         mod()
+  remainder()
-
-  These functions operate on n-dimensional vectors. A vector
@@ -588 +589 @@
-  bound is returned. If it's higher than the higher bound,
-  the higher bound is returned.
+  
+  See also: ceil(), floor(), round(), trunc()
-& BXOR()
-  bxor(<integer>, <integer>,...)
@@ -609 +612 @@
- 
-  Returns the least integral value greater than or equal to <number>.
+
+  See also: floor(), bound(), round(), trunc()
-& CEMIT()
-  cemit(<channel>, <message>[, <noisy>])
@@ -1330 +1335 @@
- 
-  Returns the greatest integral value less than or equal to <number>.
+
+  See also: ceil(), bound(), round(), trunc()
-& FMOD()
-  fmod(<number>,<divisor>)
@@ -2325 +2332 @@
-& LWHO()
-  lwho()
+  lwho(<viewer>)
-
-  This returns a list of the dbref numbers for all currently-connected
-  players. When mortals use this function, the dbref numbers of DARK
-  wizards or royalty do NOT appear on the dbref list.
+
+  If lwho() is given an argument, and used by an object that can see
+  DARK and Hidden players, lwho() returns the output of lwho() from
+  <viewer>'s point of view.
-
-  See also: mwho(), nwho(), xwho()
@@ -2468 +2480 @@
-  mean(<number>,...)
-
-
+
+
+
-& MEDIAN()
-  median(<number>,...)
-
-  Returns the median (the middlemost numerically) of its arguments.
+
+  See also: mean(), stddev()
-& MEMBER()
-  member(<list>,<word>[,<delimiter>])
@@ -3215 +3231 @@
-  0 and 6.
- 
+  See also: ceil(), floor(), bound(), trunc()
-& S()
-& S-FUNCTION
@@ -3674 +3691 @@
-
-  Returns the sample standard deviation of its arguments.
+
+  See also: mean(), median()
-& STRCAT()
-  strcat(<string1>, <string2>)
@@ -4067 +4086 @@
-  "0" if there isn't one. For example, "val(101Dalmations)"  => 101.
-  
+  See also: ceil(), floor(), bound(), round()
-& TYPE()
-  type(<object>)

1.7.7/game/txt/hlp/penntop.hlp

@@ -1918 +1918 @@
- 
- In the config file, the syntax is:
-
+ [" <error message>]
-  restrict_function function-name restriction
-
- From the game:
-
+ [" <error message>]
-  @function/restrict function-name=restriction
+ 
+For commands, if <error message> is given, that message is sent to the
+player who runs it instead of a generic, unhelpful error message.
-
-(Continued in restrict2)

1.7.7/game/txt/hlp/pennv177.hlp

@@ -1 @@
-8
+9
-& 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 39                     October 25, 2004
+
+Major Changes:
+  * Game and chat database formats have been rewritten. They are 
+    much more human-readable, can be extended with new fields
+    without using versioning flags, and provide better detection
+    and reporting of malformed databases. [SW]
+  * Chunk deref counts for locks are now stored in the database. [SW]
+Commands:
+  * New 'buy' command for purchasing items from vendors that can offer
+    multiple items at multiple prices. Patch by Walker@M*U*S*H.
+  * restrict_command and @command/restrict can now include an
+    error message to be sent when the player can't use the command,
+    which supercedes more generic errors. Suggested by Philip Mak.
+    Patch by Walker@M*U*S*H.
+Functions:
+  * lwho() can take an argument to produce the who list from that
+    player's viewpoint. Patch by Walker@M*U*S*H.
+Fixes:
+  * nattr(obj/attrib) returns 1 when matching a non-wildcarded attrib.
+    Report by Impster@M*U*S*H.
+  * +chan <msg> is now converted to @chat <chan>=<msg> (with noeval)
+    so @chat hooks apply to +chatting too. Patch by Walker@M*U*S*H.
+  * You must be able to locate a player to perform elock() on them.
+    Report by Ambrosia.
+  * Help fixes by Sketch@M*U*S*H.
+  * Simplification of @version code. [SW]
+  * cemit() restrictions are now based on those of @cemit, instead
+    of @emit. Report by BlackPhyr.
+  * Setting queue_loss to 0 disables queue_loss. A bad idea, but
+    more consistent behavior. Suggested by K Moon.
+  * Examining objects always shows their actual number of coins,
+    whether or not they're admin or no_pay.
+  * Code cleanup in @edit and in char routines. [SW].
+  * Wrong object checked when reporting money as unlimited. Report
+    by Nate Barney. [EEH]
+  * New hints/freebsd_5.sh. Suggested by James Lang.
+  * INFO command once again reports the server as "PennMUSH",
+    not just a version number. Report by Mark Hassman.
+  * Win32 linting. Builds with NT_TCP should work again (although
+    @shutdown/reboot under NT_TCP is still not functional). 
+    Reorganization of the Win32 services macros. [EEH]
+  * Fix to bug with login attempts using literal encrypted strings.
+    Reported by Cadar and Mirrador.
+  * @ps/all shows the right label on top. Patch by qa'toq@bDv.
+
+
+& 1.7.7p38
-Version 1.7.7 patchlevel 38                     August 25, 2004
-

1.7.7/game/txt/hlp/pennvOLD.hlp

@@ -4420 +4420 @@
-1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-       19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-
+, 39
-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/atr_tab.h

@@ -9 +9 @@
-ATTR attr[] = {
-  {"AAHEAR", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
+  {"ABUY", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"ACLONE", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"ACONNECT", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
@@ -42 +43 @@
-  {"AZENTER", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"AZLEAVE", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
+  {"BUY", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"CHARGES", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"COMMENT", AF_NOPROG | AF_MDARK | AF_WIZARD | AF_PREFIXMATCH,
@@ -110 +112 @@
-   NULL},
-  {"NAMEFORMAT", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
+  {"OBUY", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"ODEATH", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"ODESCRIBE", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
@@ -137 +140 @@
-  {"OZLEAVE", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"PAYMENT", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
+  {"PRICELIST", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"PREFIX", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"RECEIVE", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},

1.7.7/hdrs/boolexp.h

@@ -22 +22 @@
-extern int eval_boolexp(dbref player, boolexp b, dbref target);
-extern boolexp parse_boolexp(dbref player, const char *buf, lock_type ltype);
+extern boolexp parse_boolexp_d(dbref player, const char *buf, lock_type ltype,
+                   int derefs);
-extern void free_boolexp(boolexp b);
-boolexp getboolexp(FILE * f, const char *ltype);

1.7.7/hdrs/command.h

@@ -136 +136 @@
-struct command_info {
-  const char *name; /**< Canonical name of the command */
+  const char *restrict_message; /**< Message sent when command is restricted */
-  command_func func;    /**< Function to call when command is run */
-  unsigned int type;    /**< Types of objects that can use the command */

1.7.7/hdrs/compile.h

@@ -47 +47 @@
-#endif
-
+/* Enable Win32 services support */
+#ifdef WIN32
+#define WIN32SERVICES
+#endif
-
-
+
+
+
+
+
+
+
-/* --------------- Stuff for Win32 services ------------------ */
-/*
-
-   When "exit" is called to handle an error condition, we really want to
-   terminate the game thread, not the whole process.
-   MS VS.NET (_MSC_VER >= 1200) requires the weird noreturn stuff.
-
- */
-
-ndef __MINGW32__
+def WIN32SERVICES
-#define exit(arg) Win32_Exit (arg)
+void NORETURN WIN32_CDECL Win32_Exit(int exit_code);
-#endif
-void NORETURN WIN32_CDECL Win32_Exit(int exit_code);
-#endif              /* WIN32 */
-
-#endif              /* __COMPILE_H */

1.7.7/hdrs/externs.h

@@ -524 +524 @@
-    extern void do_wcheck_all(dbref player);
-    extern void set_initial_warnings(dbref player);
-
+
+
-
-/* From wild.c */
@@ -590 +591 @@
-
-/* From db.c */
-
+
-    extern const char *set_name(dbref obj, const char *newname);
-    extern long getref(FILE * f);
-    extern void putref(FILE * f, long int ref);
-    extern void putstring(FILE * f, const char *s);
-    extern dbref new_object(void);
-    extern int db_write_object(FILE * f, dbref i);
-    extern dbref db_write(FILE * f, int flag);
-    extern dbref db_read(FILE * f);
-
-/* From filecopy.c */

1.7.7/hdrs/game.h

@@ -54 +54 @@
-extern int config_file_startup(const char *conf, int restrictions);
-
-/* From db.c */
-extern int db_paranoid_write(FILE * f, int flag);
-
-/* From game.c */
-enum dump_type { DUMP_NORMAL, DUMP_DEBUG, DUMP_PARANOID };
@@ -101 +98 @@
-extern void do_kill(dbref player, const char *what, int cost, int slay);
-extern void do_give(dbref player, char *recipient, char *amnt, int silent);
+extern void do_buy(dbref player, char *item, char *from, int price);
-
-/* From set.c */

1.7.7/hdrs/mushdb.h

@@ -137 +137 @@
-#define DBF_NEW_POWERS          0x40000
-#define DBF_POWERS_LOGGED       0x80000
+#define DBF_LABELS              0x100000
-
-/* Reboot DB flag macros - these should be defined whether or not the

1.7.7/hdrs/mushtype.h

@@ -16 +16 @@
-/* Dbref type */
-typedef int dbref;
+
+/** The type that stores the warning bitmask */
+typedef long int warn_type;
-
-/* special dbref's */

1.7.7/hdrs/parse.h

@@ -43 +43 @@
-extern int parse_boolean(char const *str);
-extern dbref parse_dbref(char const *str);
+extern dbref qparse_dbref(char const *str);
-extern dbref parse_objid(char const *str);
-

1.7.7/hdrs/version.h

@@ -1 +1 @@
-#define VERSION "1.7.7"
-8
-08
-8
+9
+10
+9

1.7.7/src/Makefile.SH

@@ -76 +76 @@
-      ../hdrs/attrib.h ../hdrs/boolexp.h ../hdrs/bufferq.h ../hdrs/case.h \
-      ../hdrs/case.h ../hdrs/chunk.h ../hdrs/command.h ../hdrs/conf.h \
-
+dbio.h ../hdrs/
-      ../hdrs/externs.h ../hdrs/extmail.h ../hdrs/flags.h \
-      ../hdrs/function.h ../hdrs/game.h ../hdrs/getpgsiz.h ../hdrs/help.h \

1.7.7/src/atr_tab.c

@@ -49 +49 @@
-  {"locked", '+', AF_LOCKED, AF_LOCKED},
-  {"safe", 'S', AF_SAFE, AF_SAFE},
+  {"internal", '\0', AF_INTERNAL, AF_INTERNAL},
-  {"prefixmatch", '\0', AF_PREFIXMATCH, AF_PREFIXMATCH},
-  {"veiled", 'V', AF_VEILED, AF_VEILED},

1.7.7/src/attrib.c

@@ -915 +915 @@
-
-  if (!wildcard(name) && name[len - 1] != '`') {
+    parent = thing;
-    if (doparent)
-      ptr = atr_get_with_parent(thing, strupper(name), &parent);
-    else
-      ptr = atr_get_noparent(thing, strupper(name));
-
+
+
+
-  } else {
-    StrTree seen;

1.7.7/src/boolexp.c

@@ -278 +278 @@
-    static void opt_thread_jumps(struct bvm_asm *a);
-    static void optimize_bvm_asm(struct bvm_asm *a);
-
+, int derefs
-    static void free_bvm_asm(struct bvm_asm *a);
-#ifdef DEBUG_BYTECODE
@@ -1531 +1531 @@
- */
-static boolexp
-
+, int derefs
-{
-  boolexp b;
@@ -1597 +1597 @@
-  }
-
-1
+derefs
-  mush_free(bytecode, "boolexp.bytecode");
-  return b;
@@ -1609 +1609 @@
- * \param buf string representation of a boolexp.
- * \param ltype the type of lock for which the boolexp is being parsed.
+ * \param derefs the starting deref count for chunk storage.
- * \return pointer to a newly allocated boolexp.
- */
-boolexp
-(dbref player, const char *buf, lock_type ltype
+_d(dbref player, const char *buf, lock_type ltype, int derefs
-{
-  struct boolexp_node *ast;
@@ -1630 +1631 @@
-  }
-  optimize_bvm_asm(bvasm);
-
+, derefs
-#ifdef DEBUG_BYTECODE
-  printf("\nSource string: \"%s\"\n", buf);
@@ -1639 +1640 @@
-  free_bvm_asm(bvasm);
-  return bytecode;
+}
+
+/** Compile a string into boolexp bytecode.
+ * Given a textual representation of a boolexp in a string, parse it into
+ * a syntax tree, compile to bytecode, and return a pointer to a boolexp
+ * structure.
+ * \param player the enactor.
+ * \param buf string representation of a boolexp.
+ * \param ltype the type of lock for which the boolexp is being parsed.
+ * \return pointer to a newly allocated boolexp.
+ */
+boolexp
+parse_boolexp(dbref player, const char *buf, lock_type ltype)
+{
+  return parse_boolexp_d(player, buf, ltype, 0);
-}
-

1.7.7/src/bsd.c

@@ -29 +29 @@
-#define MAXHOSTNAMELEN 32
-#define LC_MESSAGES 6
-#ifndef __MINGW32__
-void shutdown_checkpoint(void);
-#endif
-#else               /* !WIN32 */
-#ifdef I_SYS_FILE
@@ -123 +120 @@
-#include "attrib.h"
-#include "game.h"
+#include "dbio.h"
-#include "confmagic.h"
-#ifdef HAS_WAITPID
@@ -329 +327 @@
-#endif
-#ifndef BOOLEXP_DEBUGGING
-
+
+
-void mainthread(int argc, char **argv);
-#else
@@ -496 +495 @@
-
-#ifndef BOOLEXP_DEBUGGING
- defined(WIN32) && !defined(__MINGW32__)
+def WIN32SERVICES
-/* Under WIN32, MUSH is a "service", so we just start a thread here.
- * The real "main" is in win32/services.c
@@ -510 +509 @@
-int
-main(int argc, char **argv)
-
+SERVICES
-{
-#ifdef AUTORESTART
@@ -721 +720 @@
-
-  /* someone has told us to shut down */
-
-
+
-  /* Keep service manager happy */
-  shutdown_checkpoint();
-#endif
-#endif
-
-  shutdown_queues();
-
-
-
+
-  /* Keep service manager happy */
-  shutdown_checkpoint();
-#endif
-#endif
-
-  close_sockets();
@@ -744 +739 @@
-#endif
-
-
-
+
-  /* Keep service manager happy */
-  shutdown_checkpoint();
-#endif
-#endif
-
@@ -767 +760 @@
-#endif
-
-
-
+
-  /* Keep service manager happy */
-  shutdown_checkpoint();
-#endif
-#endif
-
@@ -789 +780 @@
-  closesocket(sock);
-#ifdef WIN32
-ndef __MINGW32__
+def WIN32SERVICES
-  shutdown_checkpoint();
-#endif
@@ -3357 +3348 @@
-  queue_string_eol(call_by, tprintf("Connected: %d", count));
-  queue_string_eol(call_by, tprintf("Size: %d", db_top));
-
+
+
-#ifdef PATCHES
-  queue_string_eol(call_by, tprintf("Patches: %s", PATCHES));
@@ -4080 +4072 @@
-  DESC *d;
-  int first;
-
+
+
-
-  first = 1;
+
+  if (nargs && args[0] && *args[0]) {
+    /* An argument was given. Find the victim and choose the lowest
+     * perms possible */
+    if (!powered) {
+      safe_str(T(e_perm), buff, bp);
+      return;
+    }
+    if ((victim = noisy_match_result(executor, args[0], NOTYPE,
+                     MAT_EVERYTHING)) == 0) {
+      safe_str(T(e_notvis), buff, bp);
+      return;
+    }
+    if (!Priv_Who(victim))
+      powered = 0;
+  }
+
-  DESC_ITER_CONN(d) {
-(powered && Priv_Who(executor))
+powered
-      if (first)
-    first = 0;
@@ -4154 +4164 @@
-      match = d;
-  }
-
+
+
+
+
+
-}
-
@@ -4171 +4185 @@
-      match = d;
-  }
-
+
+
+
+
+
-}
-
@@ -4188 +4206 @@
-      match = d;
-  }
-
+
+
+
+
+
-}
-
@@ -4204 +4226 @@
-      match = d;
-  }
-
+
+
+
+
+
-}
-
@@ -4820 +4846 @@
-#endif
-
-
-extern jmp_buf db_err;  /**< Jump buffer in the event of a dump error */
-
-/** Dump the descriptor list to our REBOOTFILE so we can restore it on reboot.

1.7.7/src/cmds.c

@@ -993 +993 @@
-}
-
+COMMAND (cmd_buy) {
+  char *from = NULL;
+  char *forwhat = NULL;
+  int price = -1;
+
+  upcasestr(arg_left);
+
+  from = strstr(arg_left, " FROM ");
+  forwhat = strstr(arg_left, " FOR ");
+  if (from) {
+    *from = '\0';
+    from += 6;
+  }
+  if (forwhat) {
+    *forwhat = '\0';
+    forwhat += 5;
+  }
+  if (forwhat && !is_strict_integer(forwhat)) {
+    notify(player, T("Buy for WHAT price?"));
+    return;
+  } else if (forwhat) {
+    price = parse_integer(forwhat);
+    if (price < 0) {
+      notify(player, T("You can't buy things by taking money."));
+      return;
+    }
+  }
+
+  if (from)
+    from = trim_space_sep(from, ' ');
+  do_buy(player, arg_left, from, price);
+}
+
-COMMAND (cmd_give) {
-  do_give(player, arg_left, arg_right, (SW_ISSET(sw, SWITCH_SILENT)));

1.7.7/src/command.c

@@ -281 +281 @@
-   0, 0},
-
+  {"BUY", NULL, cmd_buy, CMD_T_ANY | CMD_T_NOGAGGED, 0, 0},
-  {"BRIEF", NULL, cmd_brief, CMD_T_ANY, 0, 0},
-  {"DESERT", NULL, cmd_desert, CMD_T_PLAYER | CMD_T_THING, 0, 0},
@@ -433 +434 @@
-  memset(cmd, 0, sizeof(COMMAND_INFO));
-  cmd->name = name;
+  cmd->restrict_message = NULL;
-  cmd->func = func;
-  cmd->type = type;
@@ -908 +910 @@
-    replacer = "@EMIT";
-    break;
+  case CHAT_TOKEN:
+#ifdef CHAT_TOKEN_ALIAS
+  case CHAT_TOKEN_ALIAS:
+#endif
+    /* parse_chat() destructively modifies the command to replace
+     * the first space with a '=' if the command is an actual
+     * chat command */
+    if (parse_chat(player, p + 1) && command_check_byname(player, "@CHAT")) {
+      /* This is a "+chan foo" chat style
+       * We set noevtoken to keep its noeval way, and
+       * set the cmd to allow @hook. */
+      replacer = "@CHAT";
+      noevtoken = 1;
+    }
-  }
-
@@ -918 +934 @@
-     * quite match.
-     */
-