diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 72aa25b2c..f3c21e06d 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -1,11 +1,11 @@ -.\" $NHDT-Branch: master $:$NHDT-Revision: 1.175 $ $NHDT-Date: 1434054937 2015/06/11 20:35:37 $ +.\" $NHDT-Branch: master $:$NHDT-Revision: 1.178 $ $NHDT-Date: 1435002662 2015/06/22 19:51:02 $ .ds h0 "NetHack Guidebook .ds h1 .ds h2 % .ds vr "NetHack 3.6 .ds f0 "\*(vr .ds f1 -.ds f2 "June 21, 2015 +.ds f2 "June 22, 2015 .\" labeled paragraph start (should be part of tmac.n, but I don't want to .\" make changes to that file) .\" .PS word @@ -2467,6 +2467,12 @@ Visually distinguish pets from similar animals (default off). The behavior of this option depends on the type of windowing you use. In text windowing, text highlighting or inverse video is often used; with tiles, generally displays a heart symbol near pets. +.lp hilite_pile +Visually distinguish piles of objects from individual objects (default off). +The behavior of this option depends on the type of windowing you use. +In text windowing, text highlighting or inverse video is often used; +with tiles, generally displays a small plus-symbol beside the object +on the top of the pile. .lp large_font NetHack should use a large font. .lp map_mode diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 7502199e6..271f6cb6f 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -45,7 +45,7 @@ %.au \author{Original version - Eric S. Raymond\\ (Edited and expanded for 3.6 by Mike Stephenson and others)} -\date{June 21, 2015} +\date{June 22, 2015} \maketitle @@ -2976,6 +2976,13 @@ The behavior of this option depends on the type of windowing you use. In text windowing, text highlighting or inverse video is often used; with tiles, generally displays a heart symbol near pets. %.lp +\item[\ib{hilite\verb+_+pile}] +Visually distinguish piles of objects from individual objects (default off). +The behavior of this option depends on the type of windowing you use. +In text windowing, text highlighting or inverse video is often used; +with tiles, generally displays a small plus-symbol beside the object +on the top of the pile. +%.lp \item[\ib{large\verb+_+font}] NetHack should use a large font. %.lp diff --git a/include/flag.h b/include/flag.h index bc405ba58..0a8b88492 100644 --- a/include/flag.h +++ b/include/flag.h @@ -1,4 +1,4 @@ -/* NetHack 3.6 flag.h $NHDT-Date: 1434450203 2015/06/16 10:23:23 $ $NHDT-Branch: master $:$NHDT-Revision: 1.87 $ */ +/* NetHack 3.6 flag.h $NHDT-Date: 1435002669 2015/06/22 19:51:09 $ $NHDT-Branch: master $:$NHDT-Revision: 1.89 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -210,6 +210,7 @@ struct instance_flags { boolean use_menu_color; /* use color in menus; only if wc_color */ boolean use_status_hilites; /* use color in status line */ boolean use_background_glyph; /* use background glyph when appropriate */ + boolean hilite_pile; /* mark piles of objects with a hilite */ #if 0 boolean DECgraphics; /* use DEC VT-xxx extended character set */ boolean IBMgraphics; /* use IBM extended character set */ diff --git a/src/botl.c b/src/botl.c index 527fe5669..f6fd1d20f 100644 --- a/src/botl.c +++ b/src/botl.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 botl.c $NHDT-Date: 1433161984 2015/06/01 12:33:04 $ $NHDT-Branch: status_hilite $:$NHDT-Revision: 1.61 $ */ +/* NetHack 3.6 botl.c $NHDT-Date: 1435002677 2015/06/22 19:51:17 $ $NHDT-Branch: master $:$NHDT-Revision: 1.64 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1107,7 +1107,7 @@ boolean from_configfile; { int i; anything it; - it.a_void = 0; + it = zeroany; for (i = 0; i < MAXBLSTATS; ++i) { (void) memset((genericptr_t) &status_hilites[i], 0, sizeof(struct hilite_s)); @@ -1267,7 +1267,7 @@ boolean all; int idx; anything it; - it.a_void = 0; + it = zeroany; for (idx = 0; idx < MAXBLSTATS; ++idx) { if (status_hilites[idx].set) status_threshold(idx, status_hilites[idx].anytype, diff --git a/src/options.c b/src/options.c index 85dc4c7f0..0cf54a2a5 100644 --- a/src/options.c +++ b/src/options.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 options.c $NHDT-Date: 1434999932 2015/06/22 19:05:32 $ $NHDT-Branch: master $:$NHDT-Revision: 1.221 $ */ +/* NetHack 3.6 options.c $NHDT-Date: 1435002680 2015/06/22 19:51:20 $ $NHDT-Branch: master $:$NHDT-Revision: 1.222 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -127,6 +127,7 @@ static struct Bool_Opt { { "fullscreen", &iflags.wc2_fullscreen, FALSE, SET_IN_FILE }, { "help", &flags.help, TRUE, SET_IN_GAME }, { "hilite_pet", &iflags.wc_hilite_pet, FALSE, SET_IN_GAME }, /*WC*/ + { "hilite_pile", &iflags.hilite_pile, FALSE, SET_IN_GAME }, #ifndef MAC { "ignintr", &flags.ignintr, FALSE, SET_IN_GAME }, #else diff --git a/win/X11/winmap.c b/win/X11/winmap.c index f8a663fc4..01058778a 100644 --- a/win/X11/winmap.c +++ b/win/X11/winmap.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 winmap.c $NHDT-Date: 1433806622 2015/06/08 23:37:02 $ $NHDT-Branch: master $:$NHDT-Revision: 1.22 $ */ +/* NetHack 3.6 winmap.c $NHDT-Date: 1435002689 2015/06/22 19:51:29 $ $NHDT-Branch: master $:$NHDT-Revision: 1.24 $ */ /* Copyright (c) Dean Luick, 1992 */ /* NetHack may be freely redistributed. See license for details. */ @@ -127,7 +127,7 @@ int glyph, bkglyph; #ifdef TEXTCOLOR if ((special & MG_PET) && iflags.hilite_pet) color += CLR_MAX; - if ((special & MG_OBJPILE) && iflags.use_inverse) + if ((special & MG_OBJPILE) && iflags.hilite_pile) *co_ptr = color; #endif if (!map_info->is_tile) diff --git a/win/win32/mhmap.c b/win/win32/mhmap.c index b4d7a8994..23501575e 100644 --- a/win/win32/mhmap.c +++ b/win/win32/mhmap.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 mhmap.c $NHDT-Date: 1434803886 2015/06/20 12:38:06 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.55 $ */ +/* NetHack 3.6 mhmap.c $NHDT-Date: 1435002695 2015/06/22 19:51:35 $ $NHDT-Branch: master $:$NHDT-Revision: 1.56 $ */ /* Copyright (C) 2001 by Alex Kompel */ /* NetHack may be freely redistributed. See license for details. */ @@ -790,7 +790,8 @@ onPaint(HWND hWnd) DeleteDC(hdcPetMark); } #ifdef USE_PILEMARK - if ((glyph != NO_GLYPH) && (special & MG_OBJPILE)) { + if ((glyph != NO_GLYPH) + && (special & MG_OBJPILE) && iflags.hilite_pile) { /* apply pilemark transparently over other image */ HDC hdcPileMark; HBITMAP bmPileMarkOld;