Merge remote-tracking branch 'origin/NetHack-3.6.0'

dat/tribute

@@ -2947,7 +2947,7 @@ sent, but their /spiritual/ home is in a hidden valley in the high Ramtops
 of the Discworld, where the books of history are kept.
 
 These aren't books in which the events of the past are pinned like so many
-butterflies to a cork.  These are the books from which history in derived.
+butterflies to a cork.  These are the books from which history is derived.
 There are more than twenty thousand of them, each one is ten feet high,
 bound in lead, and the letters are so small that they have to be read with
 a magnifying glass.
@@ -3098,7 +3098,7 @@ in the street looking for a towel.  And then five years later they elected
 another one just like him, and really it was amazing how intelligent
 people kept on making the same mistakes.
 
-(1) Provided that we wasn't poor, foreign, nor disqualified by reason of
+(1) Provided that he wasn't poor, foreign, nor disqualified by reason of
 being mad, frivolous, or a woman.
 
   [Small Gods, by Terry Pratchett]
@@ -4758,10 +4758,11 @@ Death.  OR THE FAME.  OR BECAUSE THEY SHOULDN'T.
 #
 %title Jingo (12)
 %passage 1
+# p. 206 (Harper Torch Edition; passage starts mid-paragraph)
 It was so much easier to blame it on Them.  It was bleakly depressing to
 think that They were Us.  If it was Them, then nothing was anyone's fault.
-If it was us, what did that make Me?  After all, I'm one of Us.  I must be.
+If it was Us, what did that make Me?  After all, I'm one of Us.  I must be.
-I've certainly never thought of myself as one of Them.  No one ever thinks
+I've certainly never thought of myself as one of Them.  /No one/ ever thinks
 of themselves as one of Them.  We're always one of Us.  It's Them that do
 the bad things.
 
@@ -7525,7 +7526,7 @@ keen night vision to find.  He had already seen some luminous spoon ants
 carrying a fork, and, to his surprise, the forgotten mazes were home to
 that very rare indoorovore, the Uncommon Sock Eater.  There were some
 things living up in the pipes, too, which periodically murmured "Awk! Awk!"
-Who knew what strange monsters made there home here?
+Who knew what strange monsters made their home here?
 
   [Unseen Academicals, by Terry Pratchett]
 %e passage

doc/Guidebook.mn

@@ -2713,6 +2713,8 @@ require "yes" rather than 'y' to confirm breaking a wand;
 .PL Remove
 require selection from inventory for 'R' and 'T'
 commands even when wearing just one applicable item.
+.PL all
+turn on all of the above.
 .PE
 By default, the pray choice is enabled, the others disabled.
 To disable it without setting

doc/Guidebook.tex

@@ -3308,6 +3308,8 @@ require ``{\tt yes}'' rather than `{\tt y}' to confirm breaking
 a wand;
 \item[{\tt Remove~}] require selection from inventory for `{\tt R}' and `{\tt T}'
 commands even when wearing just one applicable item.
+\item[{\tt all~~~~}]
+turn on all of the above.
 \elist
 %.ei
 %.ed

src/apply.c

@@ -18,7 +18,7 @@ STATIC_DCL void FDECL(use_bell, (struct obj **));
 STATIC_DCL void FDECL(use_candelabrum, (struct obj *));
 STATIC_DCL void FDECL(use_candle, (struct obj **));
 STATIC_DCL void FDECL(use_lamp, (struct obj *));
-STATIC_DCL void FDECL(light_cocktail, (struct obj *));
+STATIC_DCL void FDECL(light_cocktail, (struct obj **));
 STATIC_PTR void FDECL(display_jump_positions, (int));
 STATIC_DCL void FDECL(use_tinning_kit, (struct obj *));
 STATIC_DCL void FDECL(use_figurine, (struct obj **));
@@ -1339,9 +1339,10 @@ struct obj *obj;
 }
 
 STATIC_OVL void
-light_cocktail(obj)
+light_cocktail(optr)
-struct obj *obj; /* obj is a potion of oil */
+struct obj **optr;
 {
+    struct obj *obj = *optr; /* obj is a potion of oil */
     char buf[BUFSZ];
     boolean split1off;
 
@@ -1359,7 +1360,7 @@ struct obj *obj; /* obj is a potion of oil */
          * but its easy.
          */
         freeinv(obj);
-        (void) addinv(obj);
+        *optr = addinv(obj);
         return;
     } else if (Underwater) {
         There("is not enough oxygen to sustain a fire.");
@@ -1392,6 +1393,7 @@ struct obj *obj; /* obj is a potion of oil */
         if (obj)
             obj->nomerge = 0;
     }
+    *optr = obj;
 }
 
 static NEARDATA const char cuddly[] = { TOOL_CLASS, GEM_CLASS, 0 };
@@ -3586,7 +3588,7 @@ doapply()
         use_lamp(obj);
         break;
     case POT_OIL:
-        light_cocktail(obj);
+        light_cocktail(&obj);
         break;
     case EXPENSIVE_CAMERA:
         res = use_camera(obj);

src/dungeon.c

@@ -1638,7 +1638,7 @@ lev_by_name(nam)
 const char *nam;
 {
     schar lev = 0;
-    s_level *slev;
+    s_level *slev = (s_level *)0;
     d_level dlev;
     const char *p;
     int idx, idxtoo;

src/objnam.c

@@ -912,8 +912,15 @@ unsigned doname_flags;
             break;
         }
         if (obj->otyp == LEASH && obj->leashmon != 0) {
-            Sprintf(eos(bp), " (attached to %s)",
+            struct monst *mlsh = find_mid(obj->leashmon, FM_FMON);
-                    a_monnam(find_mid(obj->leashmon, FM_FMON)));
+
+            if (!mlsh) {
+                impossible("leashed monster not on this level");
+                obj->leashmon = 0;
+            } else {
+                Sprintf(eos(bp), " (attached to %s)",
+                        a_monnam(mlsh));
+            }
             break;
         }
         if (obj->otyp == CANDELABRUM_OF_INVOCATION) {

src/topten.c

@@ -30,7 +30,10 @@ static long final_fpos;
 
 #define newttentry() (struct toptenentry *) alloc(sizeof (struct toptenentry))
 #define dealloc_ttentry(ttent) free((genericptr_t) (ttent))
+#ifndef NAMSZ
+/* Changing NAMSZ can break your existing record/logfile */
 #define NAMSZ 10
+#endif
 #define DTHSZ 100
 #define ROLESZ 3
 

win/tty/wintty.c

@@ -478,7 +478,7 @@ makepicks:
                     setup_rolemenu(win, TRUE, RACE, GEND, ALGN);
                     /* add miscellaneous menu entries */
                     role_menu_extra(ROLE_RANDOM, win, TRUE);
-                    any.a_int = 0; /* separator, not a choice */
+                    any = zeroany; /* separator, not a choice */
                     add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "",
                              MENU_UNSELECTED);
                     role_menu_extra(RS_RACE, win, FALSE);