Merge remote-tracking branch 'upstream/master'

liam-middlebrook · liam-middlebrook · commit 68ccdb98b3e6 · 2017-09-23T10:10:29.000-07:00
diff --git a/aimake b/aimake
@@ -299,8 +299,8 @@ handling (to place the files in the right place).
 
 =item LEXFLAGS
 
-Command-line arguments to pass to C<lex>.  The default is to pass C<--warn>,
-which tells C<flex> (the default C<lex> implementation) to produce warnings.
+Command-line arguments to pass to C<lex>.  The default is an empty set of
+options.
 
 =back
 
@@ -10820,7 +10820,7 @@ EOF
 
         default_lexflags => {
             output => 'optionset:LEXFLAGS',
-            outdepends => ['optstring:--warn'],
+            outdepends => [],
             verb => 'determined',
             low_message_priority => 1,
             command_line_override => 'LEXFLAGS',
diff --git a/libnethack/dat/history b/libnethack/dat/history
@@ -1,5 +1,5 @@
 NetHack History file for release 4.3.0-beta3
-This file was last updated by Alex Smith, 2015-04-01
+This file was last updated by Alex Smith, 2017-09-01
 
 Behold, mortal, the origins of NetHack...
 
@@ -270,8 +270,7 @@ The NetHack 4 distribution also contains contributions from:
     Edoardo Spadolini         Nathan Eady               Tim Visher
     Eric S. Raymond           Nephi                     Trevor Cook
     Fredrik Ljungdahl         Pasi Kallinnen            Tung Nguyen
-    GreyKnight                Patric Müller             Wan-ichi
-    Grunt                     Paul Pliska               Zmy
-    Haruko Numata             Paula Breton              Zsbán Ambrus
-    Hojita Discordia          quuxplusone               
-    
+    GreyKnight                Patric Müller             Vincent Ho
+    Grunt                     Paul Pliska               Wan-ichi
+    Haruko Numata             Paula Breton              Zmy
+    Hojita Discordia          quuxplusone               Zsbán Ambrus
diff --git a/libnethack/include/extern.h b/libnethack/include/extern.h
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-07-22 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Steve Creps, 1988.                               */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -646,7 +646,8 @@ extern void lookaround(enum u_interaction_mode);
 extern int monster_nearby(void);
 extern void losehp(int, const char *);
 extern int weight_cap(void);
-extern int inv_weight(void);
+extern int inv_weight_over_cap(void);
+extern int inv_weight_total(void);
 extern int near_capacity(void);
 extern int calc_capacity(int);
 extern int max_capacity(void);
diff --git a/libnethack/include/permonst.h b/libnethack/include/permonst.h
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2014-04-05 */
+/* Last modified by Alex Smith, 2017-07-15 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -81,7 +81,7 @@ extern const struct permonst mons[];    /* the master list of monster types */
 # define FAST_SPEED 15
 # define VERY_FAST 24
 
-# define NON_PM     PM_PLAYERMON      /* "not a monster" */
+# define NON_PM     (-1)              /* "not a monster" */
 # define LOW_PM     (NON_PM+1)        /* first monster in mons[] */
 # define SPECIAL_PM PM_LONG_WORM_TAIL /* [normal] < ~ < [special] */
         /* mons[SPECIAL_PM] through mons[NUMMONS-1], inclusive, are never
diff --git a/libnethack/src/cmd.c b/libnethack/src/cmd.c
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-10-11 */
+/* Last modified by Alex Smith, 2017-07-15 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -868,7 +868,7 @@ doattributes(const struct nh_cmd_arg *arg)
     add_menutext(&menu, buf);
 
     wc = weight_cap();
-    buf = msgprintf("%-10s: %ld (", "burden", wc + inv_weight());
+    buf = msgprintf("%-10s: %d (", "burden", inv_weight_total());
 
     switch (calc_capacity(wc / 4)) {
     case UNENCUMBERED:
diff --git a/libnethack/src/do.c b/libnethack/src/do.c
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-07-20 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -827,7 +827,7 @@ doup(void)
         return 1;
     }
     if (near_capacity() > SLT_ENCUMBER) {
-        /* No levitation check; inv_weight() already allows for it */
+        /* No levitation check; the weight check already allows for it */
         pline("Your load is too heavy to climb the %s.",
               level->locations[u.ux][u.uy].typ == STAIRS ? "stairs" : "ladder");
         return 1;
diff --git a/libnethack/src/dokick.c b/libnethack/src/dokick.c
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-07-12 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Izchak Miller, Mike Stephenson, Steve Linhart, 1989. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -200,7 +200,7 @@ kick_monster(xchar x, xchar y, schar dx, schar dy)
         return attack_status;
     }
 
-    i = -inv_weight();
+    i = -inv_weight_over_cap();
     j = weight_cap();
 
     if (i < (j * 3) / 10) {
@@ -800,7 +800,7 @@ dokick(const struct nh_cmd_arg *arg)
         if (Is_airlevel(&u.uz) || Levitation) {
             int range;
 
-            range = ((int)youmonst.data->cwt + (weight_cap() + inv_weight()));
+            range = ((int)youmonst.data->cwt + inv_weight_total());
             if (range < 1)
                 range = 1;      /* divide by zero avoidance */
             range = (3 * (int)mdat->cwt) / range;
diff --git a/libnethack/src/dothrow.c b/libnethack/src/dothrow.c
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-05-19 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -474,7 +474,7 @@ hurtle_step(void *arg, int x, int y)
         }
         if ((u.ux - x) && (u.uy - y) && bad_rock(youmonst.data, u.ux, y) &&
             bad_rock(youmonst.data, x, u.uy)) {
-            boolean too_much = (invent && (inv_weight() + weight_cap() > 600));
+            boolean too_much = (invent && (inv_weight_total() > 600));
 
             /* Move at a diagonal. */
             if (bigmonst(youmonst.data) || too_much) {
diff --git a/libnethack/src/files.c b/libnethack/src/files.c
@@ -1,11 +1,11 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-07-11 */
+/* Last modified by Alex Smith, 2017-09-01 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #if defined(AIMAKE_BUILDOS_MSWin32)
 # define WIN32_LEAN_AND_MEAN
-# include <Windows.h> /* must be before compilers.h */
+# include <windows.h> /* must be before compilers.h */
 
 # if !defined(S_IRUSR)
 #  define S_IRUSR _S_IREAD
diff --git a/libnethack/src/hack.c b/libnethack/src/hack.c
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Fredrik Ljungdahl, 2015-10-02 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -859,7 +859,7 @@ test_move(int ux, int uy, int dx, int dy, int dz, int mode,
                 pline("Your body is too large to fit through.");
             return FALSE;
         }
-        if (invent && (inv_weight() + weight_cap() > 600)) {
+        if (invent && (inv_weight_total() > 600)) {
             if (mode == DO_MOVE)
                 pline("You are carrying too much to get through.");
             return FALSE;
@@ -905,7 +905,7 @@ test_move(int ux, int uy, int dx, int dy, int dz, int mode,
     /* Can we be blocked by a boulder? */
     if (!throws_rocks(youmonst.data) &&
         !(verysmall(youmonst.data) && !u.usteed) &&
-        !((!invent || inv_weight() <= -850) && !u.usteed)) {
+        !((!invent || inv_weight_over_cap() <= -850) && !u.usteed)) {
         /* We assume we can move boulders when we're at a distance from them.
            When it comes to actually do the move, resolve_uim() may replace the
            move with a #pushboulder command. If it doesn't, the move fails
@@ -3099,12 +3099,8 @@ weight_cap(void)
     return (int)carrcap;
 }
 
-static int wc;  /* current weight_cap(); valid after call to inv_weight() */
-
-/* returns how far beyond the normal capacity the player is currently. */
-/* inv_weight() is negative if the player is below normal capacity. */
 int
-inv_weight(void)
+inv_weight_total(void)
 {
     struct obj *otmp = invent;
     int wt = 0;
@@ -3116,18 +3112,27 @@ inv_weight(void)
             wt += otmp->owt;
         otmp = otmp->nobj;
     }
-    wc = weight_cap();
-    return wt - wc;
+    return wt;
+}
+
+/* Returns how far beyond the normal capacity the player is currently. Negative
+   if the player is below normal capacity. */
+int
+inv_weight_over_cap(void)
+{
+    return inv_weight_total() - weight_cap();
 }
 
+
 /*
  * Returns 0 if below normal capacity, or the number of "capacity units"
  * over the normal capacity the player is loaded.  Max is 5.
  */
 int
 calc_capacity(int xtra_wt)
 {
-    int cap, wt = inv_weight() + xtra_wt;
+    int wc = weight_cap();
+    int cap, wt = inv_weight_total() + xtra_wt - wc;
 
     if (wt <= 0)
         return UNENCUMBERED;
@@ -3146,9 +3151,9 @@ near_capacity(void)
 int
 max_capacity(void)
 {
-    int wt = inv_weight();
+    int wt = inv_weight_over_cap();
 
-    return wt - (2 * wc);
+    return wt - (2 * weight_cap());
 }
 
 boolean
diff --git a/libnethack/src/memfile.c b/libnethack/src/memfile.c
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-11-11 */
+/* Last modified by Alex Smith, 2017-06-28 */
 /* Copyright (c) Daniel Thaler, 2011.                             */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -472,7 +472,7 @@ mdiffcmd_width(const struct memfile *mf, struct mdiff_command_instance *mdci,
 static void
 mdiffwritecmd(struct memfile *mf, struct mdiff_command_instance *mdci)
 {
-    int widenings, usedbits, usedbytes, i;
+    int widenings, usedbits, usedbytes, splitbytes, i;
 
     /* Count the number of widenings we need. */
     usedbytes = mdiffcmd_width(mf, mdci, &widenings);
@@ -490,27 +490,42 @@ mdiffwritecmd(struct memfile *mf, struct mdiff_command_instance *mdci)
     usedbits +=  mdiff_command_sizes[mdci->command].arg2;
     encoding |=  mdci->arg2;
 
-    /* Add the encoding of arg1. */
+    /* Add the encoding of arg1.
+
+       We have to be careful here: the MRU prefix + arg2 + arg1 might come to
+       more than 8 bytes (e.g. in the case of an eof_crc32 command with a very
+       large copy count).  As such, we split the largest possible whole number
+       of bytes off from the end of arg1. */
     usedbits = usedbytes * 8 - usedbits;
-    encoding <<= usedbits;
+    splitbytes = usedbits / 8;
+    encoding <<= usedbits % 8;
     unsigned long long arg1_2c = mdci->arg1 & ((1ULL << usedbits) - 1);
-    encoding |= arg1_2c;
+    encoding |= arg1_2c >> (splitbytes * 8);
 
-    i = usedbytes;
+    i = usedbytes - splitbytes;
     while (i--)
         mdiffwrite8(mf, encoding >> (i * 8));
+    i = splitbytes;
+    while (i--)
+        mdiffwrite8(mf, arg1_2c >> (i * 8));
 
     if (debuglog) {
         fprintf(debuglog, "%s %" PRIdLEAST64 " %" PRIuLEAST64 " (",
                 mdiff_command_sizes[mdci->command].name,
                 (int_least64_t)mdci->arg1, (uint_least64_t)mdci->arg2);
 
-        i = usedbytes*8;
+        i = (usedbytes - splitbytes) * 8;
         while (i--) {
             fprintf(debuglog, "%d", (int)(1 & (encoding >> i)));
             if (i && !(i%8))
                 fprintf(debuglog, " ");
         }
+        i = splitbytes * 8;
+        while (i--) {
+            fprintf(debuglog, "%d", (int)(1 & (arg1_2c >> i)));
+            if (i && !(i%8))
+                fprintf(debuglog, " ");
+        }
     }
 
     /* Record that this command appears in the diff. */
diff --git a/libnethack/src/timeout.c b/libnethack/src/timeout.c
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-07-22 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -320,7 +320,7 @@ nh_timeout(void)
                     /* The more you are carrying the more likely you are to
                        make noise when you fumble.  Adjustments to this number
                        must be thoroughly play tested. */
-                    if ((inv_weight() > -500)) {
+                    if ((inv_weight_over_cap() > -500)) {
                         pline("You make a lot of noise!");
                         wake_nearby(FALSE);
                     }
diff --git a/libnethack/src/trap.c b/libnethack/src/trap.c
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-10-11 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -3263,7 +3263,7 @@ try_disarm(struct trap *ttmp, boolean force_failure, schar dx, schar dy)
     /* duplicate tight-space checks from test_move */
     if (dx && dy && bad_rock(youmonst.data, u.ux, ttmp->ty) &&
         bad_rock(youmonst.data, ttmp->tx, u.uy)) {
-        if ((invent && (inv_weight() + weight_cap() > 600)) ||
+        if ((invent && (inv_weight_total() > 600)) ||
             bigmonst(youmonst.data)) {
             /* don't allow untrap if they can't get thru to it */
             pline("You are unable to reach the %s!", trapexplain[ttype - 1]);
@@ -3538,7 +3538,7 @@ help_monster_out(struct monst *mtmp, struct trap *ttmp)
     }
 
     /* is the monster too heavy? */
-    wt = inv_weight() + mtmp->data->cwt;
+    wt = inv_weight_over_cap() + mtmp->data->cwt;
     if (!try_lift(mtmp, ttmp, wt, FALSE))
         return 1;
 
diff --git a/libnethack/src/u_init.c b/libnethack/src/u_init.c
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-06-15 */
+/* Last modified by Alex Smith, 2017-06-29 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -851,7 +851,7 @@ u_init_inv_skills(void)
         }
 
     /* make sure you can carry all you have - especially for Tourists */
-    while (inv_weight() > 0) {
+    while (inv_weight_over_cap() > 0) {
         if (adjattrib(A_STR, 1, TRUE))
             continue;
         if (adjattrib(A_CON, 1, TRUE))
diff --git a/libnethack/util/makedefs.c b/libnethack/util/makedefs.c
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2015-03-21 */
+/* Last modified by Alex Smith, 2017-07-15 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* Copyright (c) M. Stephenson, 1990, 1991.                       */
 /* Copyright (c) Dean Luick, 1990.                                */
@@ -985,9 +985,6 @@ do_permonst(const char *outfile)
     fprintf(ofp, "%s", Dont_Edit_Code);
     fprintf(ofp, "#ifndef PM_H\n#define PM_H\n");
 
-    if (strcmp(mons[0].mname, "playermon") != 0)
-        fprintf(ofp, "\n#define\tPM_PLAYERMON\t(-1)");
-
     for (i = 0; mons[i].mlet; i++) {
         fprintf(ofp, "\n#define\tPM_");
         if (mons[i].mlet == S_HUMAN && !strncmp(mons[i].mname, "were", 4))
diff --git a/libnethack_common/include/netconnect.h b/libnethack_common/include/netconnect.h
@@ -1,5 +1,5 @@
 /* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
-/* Last modified by Alex Smith, 2014-10-05 */
+/* Last modified by Alex Smith, 2017-09-01 */
 /* Copyright (c) Daniel Thaler, 2012. */
 /* Copyright (c) 2014 Alex Smith. */
 /* This network connection library may be freely redistributed under the terms of
@@ -30,9 +30,9 @@
 #  include <sys/select.h>
 #  include <sys/time.h>
 # else
-#  include <Winsock2.h>
-#  include <Ws2def.h>
-#  include <Ws2tcpip.h>
+#  include <winsock2.h>
+#  include <ws2def.h>
+#  include <ws2tcpip.h>
 
 #  define snprintf(buf, len, fmt, ...) \
     _snprintf_s(buf, len, len-1, fmt, __VA_ARGS__)
diff --git a/libuncursed/src/plugins/sdl.c b/libuncursed/src/plugins/sdl.c
diff --git a/libuncursed/src/test_uncursed.c b/libuncursed/src/test_uncursed.c
diff --git a/nethack/src/map.c b/nethack/src/map.c
diff --git a/nethack/src/rungame.c b/nethack/src/rungame.c
