option name change to statushilites

 Changes to be committed:
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
	modified:   include/flag.h
	modified:   src/options.c
	modified:   win/tty/wintty.c

example:
OPTIONS=statushilites
OPTIONS=hilite_status:hitpoints/30%/bright-magenta/normal

diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index a16e2b1bae69932876c2ca429bb1d665a8277e98..9615cc6e3f5ee0499ee9967ac321081518e29783 100644 (file)
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -1,4 +1,4 @@
-.\" $NHDT-Branch: master $:$NHDT-Revision: 1.170 $ $NHDT-Date: 1433125736 2015/06/01 02:28:56 $
+.\" $NHDT-Branch: status_hilite $:$NHDT-Revision: 1.172 $ $NHDT-Date: 1433212164 2015/06/02 02:29:24 $
 .ds h0 "NetHack Guidebook
 .ds h1
 .ds h2 %
@@ -2368,7 +2368,7 @@ Display a sparkly effect when a monster (including yourself) is hit by an
 attack to which it is resistant (default on).
 .lp standout
 Boldface monsters and ``\fB--More--\fP'' (default off).
-.lp statuscolors
+.lp statushilites
 Enable coloring of status fields (default off).
 See ``Configuring Status Hilites'' for futher information.
 .lp suppress_alert
@@ -2813,7 +2813,7 @@ Behaviours can occur based on percentage thresholds, updown, or absolute values.
 The in-game options menu can help you determine the correct syntax for a 
 config file.
 .lp ""
-The whole feature can be disable by setting option {\itstatuscolors} off.
+The whole feature can be disable by setting option statushilites off.
 .pg
 .hn 2
 Modifying NetHack Symbols 

diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex
index ff45a54005fe6268c470124be1fac36b700b3ec0..bfffe1a6081977dbf8ab4f5987a8420dd53d2ec5 100644 (file)
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -2846,7 +2846,7 @@ attack to which it is resistant (default on).
 \item[\ib{standout}]
 Boldface monsters and ``{\tt --More--}'' (default off).
 %.lp
-\item[\ib{statuscolors}]
+\item[\ib{statushilites}]
 Enable coloring of status fields (default off).
 See ``{\it Configuring Status Hilites\/}'' for further information.
 %.lp
@@ -3411,7 +3411,7 @@ The in-game options menu can help you determine the correct syntax for a
 config file.
 
 %.lp ""
-The whole feature can be disable by setting option {\it statuscolors} off.%.lp
+The whole feature can be disable by setting option {\it statushilites} off.%.lp
 
 %.hn 2
 \subsection*{Modifying NetHack Symbols}

diff --git a/include/flag.h b/include/flag.h
index 9768cd7322b317f8596cf1e61eef8c8edbf67e80..5e9d339961d7cf88b688901db6ccdc868fe9ffce 100644 (file)
--- a/include/flag.h
+++ b/include/flag.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6 flag.h  $NHDT-Date: 1432512781 2015/05/25 00:13:01 $  $NHDT-Branch: master $:$NHDT-Revision: 1.81 $ */
+/* NetHack 3.6 flag.h  $NHDT-Date: 1433212171 2015/06/02 02:29:31 $  $NHDT-Branch: status_hilite $:$NHDT-Revision: 1.85 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -208,7 +208,7 @@ struct instance_flags {
     uchar num_pad_mode;
     boolean echo;             /* 1 to echo characters */
     boolean use_menu_color;   /* use color in menus; only if wc_color */
-    boolean use_status_color; /* use color in status */
+    boolean use_status_hilites; /* use color in status */
 #if 0
        boolean  DECgraphics;   /* use DEC VT-xxx extended character set */
        boolean  IBMgraphics;   /* use IBM extended character set */

diff --git a/src/options.c b/src/options.c
index cbbd2c0a0d24b7aa35e4d46d9ccec1e00eeb7525..53009afe57aec978f1f33882f0f68161bf0d30ac 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 options.c       $NHDT-Date: 1433161989 2015/06/01 12:33:09 $  $NHDT-Branch: status_hilite $:$NHDT-Revision: 1.211 $ */
+/* NetHack 3.6 options.c       $NHDT-Date: 1433212185 2015/06/02 02:29:45 $  $NHDT-Branch: status_hilite $:$NHDT-Revision: 1.213 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -196,7 +196,7 @@ static struct Bool_Opt {
     { "sparkle", &flags.sparkle, TRUE, SET_IN_GAME },
     { "splash_screen", &iflags.wc_splash_screen, TRUE, DISP_IN_GAME }, /*WC*/
     { "standout", &flags.standout, FALSE, SET_IN_GAME },
-    { "statuscolors", &iflags.use_status_color, FALSE, SET_IN_GAME },
+    { "statushilites", &iflags.use_status_hilites, FALSE, SET_IN_GAME },
     { "tiled_map", &iflags.wc_tiled_map, PREFER_TILED, DISP_IN_GAME }, /*WC*/
     { "time", &flags.time, FALSE, SET_IN_GAME },
 #ifdef TIMED_DELAY

diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index 6d492bd6fc3de5b4af7bd103a23316146ee6d5ed..a59ad11d7748093aea063fd19e31ec53d939e09c 100644 (file)
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 wintty.c        $NHDT-Date: 1433209190 2015/06/02 01:39:50 $  $NHDT-Branch: status_hilite $:$NHDT-Revision: 1.101 $ */
+/* NetHack 3.6 wintty.c        $NHDT-Date: 1433212192 2015/06/02 02:29:52 $  $NHDT-Branch: status_hilite $:$NHDT-Revision: 1.103 $ */
 /* Copyright (c) David Cohrs, 1991                               */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -2363,7 +2363,7 @@ const char *str;
         (void) strncpy(&cw->data[cw->cury][j], str, cw->cols - j - 1);
         cw->data[cw->cury][cw->cols - 1] = '\0'; /* null terminate */
 #ifdef STATUS_VIA_WINDOWPORT
-        if (!iflags.use_status_color) {
+        if (!iflags.use_status_hilites) {
 #endif
             cw->cury = (cw->cury + 1) % 2;
             cw->curx = 0;
@@ -3427,7 +3427,7 @@ genericptr_t ptr;
      * updates everything on the display, everytime
      */
 
-    if (!beenhere || !iflags.use_status_color) {
+    if (!beenhere || !iflags.use_status_hilites) {
         char newbot1[MAXCO], newbot2[MAXCO];
 
         newbot1[0] = '\0';