Merge branch 'master' into win32-x64-working

dat/symbols

@@ -302,6 +302,7 @@ finish
 # Recommended symset for blind players 
 # courtesy Michael Feir
 start: NHAccess
+	Description: Recommended for blind players
 	S_stone: \032
 	S_vwall: \124
 	S_hwall: \045

dat/tribute

@@ -1342,15 +1342,12 @@ If you take enough precautions, you never need to take precautions.
 %e title
 %e section
 #-----------------------------------------------------
-# Currently this section is not used. It is added
+# Used for interaction with Death.
-# to illustrate how these could be added and adapted
-# should they be useful for something
 #
 %section Death
 %title Death Quotes (2)
 %passage 1
-WHERE THE FIRST PRIMAL CELL WAS, THERE WAS I ALSO. WHERE MAN IS, THERE AM I.
+WHERE THE FIRST PRIMAL CELL WAS, THERE WAS I ALSO. WHERE MAN IS, THERE AM I. WHEN THE LAST LIFE CRAWLS UNDER FREEZING STARS, THERE WILL I BE.
-WHEN THE LAST LIFE CRAWLS UNDER FREEZING STARS, THERE WILL I BE.
 %e passage
 %passage 2
 I AM DEATH, NOT TAXES. *I* TURN UP ONLY ONCE.

src/drawing.c

@@ -375,7 +375,7 @@ init_showsyms()
 
     for (i = 0; i < MAXOTHER; i++) {
         if (i == SYM_BOULDER)
-            showsyms[i + SYM_OFF_X] = iflags.bouldersym;
+            showsyms[i + SYM_OFF_X] = iflags.bouldersym ? iflags.bouldersym : def_oc_syms[ROCK_CLASS].sym;
         else if (i == SYM_INVISIBLE)
             showsyms[i + SYM_OFF_X] = DEF_INVISIBLE;
     }
@@ -401,7 +401,7 @@ init_l_symbols()
 
     for (i = 0; i < MAXOTHER; i++) {
         if (i == SYM_BOULDER)
-            l_syms[i + SYM_OFF_X] = iflags.bouldersym;
+            l_syms[i + SYM_OFF_X] = iflags.bouldersym ? iflags.bouldersym : def_oc_syms[ROCK_CLASS].sym;
         else if (i == SYM_INVISIBLE)
             l_syms[i + SYM_OFF_X] = DEF_INVISIBLE;
     }
@@ -433,7 +433,7 @@ init_r_symbols()
 
     for (i = 0; i < MAXOTHER; i++) {
         if (i == SYM_BOULDER)
-            r_syms[i + SYM_OFF_X] = iflags.bouldersym;
+            r_syms[i + SYM_OFF_X] = iflags.bouldersym ? iflags.bouldersym : def_oc_syms[ROCK_CLASS].sym;
         else if (i == SYM_INVISIBLE)
             r_syms[i + SYM_OFF_X] = DEF_INVISIBLE;
     }

src/mapglyph.c

@@ -135,7 +135,7 @@ unsigned *ospecial;
             cmap_color(offset);
     } else if ((offset = (glyph - GLYPH_OBJ_OFF)) >= 0) { /* object */
         idx = objects[offset].oc_class + SYM_OFF_O;
-        if (offset == BOULDER && iflags.bouldersym)
+        if (offset == BOULDER)
             idx = SYM_BOULDER + SYM_OFF_X;
         if (has_rogue_color && iflags.use_color) {
             switch (objects[offset].oc_class) {

src/mon.c

@@ -2434,7 +2434,8 @@ wake_nearby()
             continue;
         if (distu(mtmp->mx, mtmp->my) < u.ulevel * 20) {
             mtmp->msleeping = 0;
-            mtmp->mstrategy &= ~STRAT_WAITMASK;
+            if (!unique_corpstat(mtmp->data))
+                mtmp->mstrategy &= ~STRAT_WAITMASK;
             if (mtmp->mtame && !mtmp->isminion)
                 EDOG(mtmp)->whistletime = moves;
         }
@@ -2453,7 +2454,8 @@ register int x, y, distance;
             continue;
         if (distance == 0 || dist2(mtmp->mx, mtmp->my, x, y) < distance) {
             mtmp->msleeping = 0;
-            mtmp->mstrategy &= ~STRAT_WAITMASK;
+            if (!unique_corpstat(mtmp->data))
+                mtmp->mstrategy &= ~STRAT_WAITMASK;
         }
     }
 }

src/music.c

@@ -73,7 +73,7 @@ int distance;
             mtmp->mcanmove = 1;
             mtmp->mfrozen = 0;
             /* may scare some monsters -- waiting monsters excluded */
-            if ((mtmp->mstrategy & STRAT_WAITMASK) != 0)
+            if (!unique_corpstat(mtmp->data) && (mtmp->mstrategy & STRAT_WAITMASK) != 0)
                 mtmp->mstrategy &= ~STRAT_WAITMASK;
             else if (distm < distance / 3
                      && !resist(mtmp, TOOL_CLASS, 0, NOTELL))
@@ -195,7 +195,7 @@ struct monst *bugler; /* monster that played instrument */
             mtmp->mcanmove = 1;
             mtmp->mfrozen = 0;
             /* may scare some monsters -- waiting monsters excluded */
-            if ((mtmp->mstrategy & STRAT_WAITMASK) != 0)
+            if (!unique_corpstat(mtmp->data) && (mtmp->mstrategy & STRAT_WAITMASK) != 0)
                 mtmp->mstrategy &= ~STRAT_WAITMASK;
             else if (distm < distance / 3
                      && !resist(mtmp, TOOL_CLASS, 0, NOTELL))

src/sounds.c

@@ -1,4 +1,4 @@
-/* NetHack 3.6	sounds.c	$NHDT-Date: 1434421352 2015/06/16 02:22:32 $  $NHDT-Branch: master $:$NHDT-Revision: 1.64 $ */
+/* NetHack 3.6	sounds.c	$NHDT-Date: 1434750452 2015/06/19 21:47:32 $  $NHDT-Branch: master $:$NHDT-Revision: 1.68 $ */
 /*	Copyright (c) 1989 Janet Walz, Mike Threepoint */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -917,9 +917,11 @@ register struct monst *mtmp;
                 tribtitle = noveltitle(&novelidx);
             }
             if (tribtitle) {
-                Sprintf(verbuf,
+                Sprintf(verbuf, "Ah, so you have a copy of /%s/.", tribtitle);
-             "Ah, so you have a copy of '%s'. I may have been misquoted there.",
+                /* no Death featured in these two, so exclude them */
-                        tribtitle);
+                if (!(strcmpi(tribtitle, "Snuff") == 0 ||                
+                      strcmpi(tribtitle, "The Wee Free Men") == 0))
+                    Strcat(verbuf, " I may have been misquoted there.");
                 verbl_msg = verbuf;
                 context.tribute.Deathnotice = 1;
             }
@@ -940,10 +942,12 @@ register struct monst *mtmp;
     else if (mtmp->mcan && verbl_msg_mcan)
         verbalize1(verbl_msg_mcan);
     else if (verbl_msg) {
-        if (ptr == &mons[PM_DEATH]) { /* Death talks in CAPITAL LETTERS */
+        if (ptr == &mons[PM_DEATH]) {
+            /* Death talks in CAPITAL LETTERS
+               and without quotation marks */
             char tmpbuf[BUFSZ];
             Sprintf(tmpbuf, "%s", verbl_msg);
-            verbalize1(ucase(tmpbuf));
+            pline(ucase(tmpbuf));
         } else {
             verbalize1(verbl_msg);
         }

src/version.c

@@ -1,4 +1,4 @@
-/* NetHack 3.6	version.c	$NHDT-Date: 1434505545 2015/06/17 01:45:45 $  $NHDT-Branch: master $:$NHDT-Revision: 1.35 $ */
+/* NetHack 3.6	version.c	$NHDT-Date: 1434669434 2015/06/18 23:17:14 $  $NHDT-Branch: master $:$NHDT-Revision: 1.36 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -15,7 +15,7 @@
 #include "patchlevel.h"
 #endif
 
-#define BETA_INFO "Beta2"
+#define BETA_INFO "Beta3"
 
 STATIC_DCL void FDECL(insert_rtoptions, (winid,char *,const char *));