[nethack] 03/04: Fix abnormal behavior in the HP monitor patch. (Closes: #818051)

[James Cowgill]

This is an automated email from the git hooks/post-receive script.

jcowgill-guest pushed a commit to branch master
in repository nethack.

commit a063646f229d9f1a868ef17fe6da79633e9deca3
Author: Mo Jun <royclark086 at gmail.com>
Date:   Mon Mar 21 13:29:19 2016 +0000

    Fix abnormal behavior in the HP monitor patch. (Closes: #818051)
---
 ...Enables-color-HP-monitor-for-textmode-NetHack.patch | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0010-Enables-color-HP-monitor-for-textmode-NetHack.patch b/debian/patches/0010-Enables-color-HP-monitor-for-textmode-NetHack.patch
index 792cd06..b659af3 100644
--- a/debian/patches/0010-Enables-color-HP-monitor-for-textmode-NetHack.patch
+++ b/debian/patches/0010-Enables-color-HP-monitor-for-textmode-NetHack.patch
@@ -126,7 +126,7 @@ Subject: Enables color HP monitor for textmode NetHack.
 +            hp, hpmax, u.uen, u.uenmax, u.uac);
 +#else
 +    curs(WIN_STATUS, 1, 1);
-+    putstr(WIN_STATUS, 0, newbot2);
++    putmixed(WIN_STATUS, 0, newbot2);
 +
 +    Sprintf(nb = eos(newbot2), "%d(%d)", hp, hpmax);
 +#if defined(TEXTCOLOR) && !defined(LISP_GRAPHICS)
@@ -147,7 +147,7 @@ Subject: Enables color HP monitor for textmode NetHack.
 +      if (hpcolor != NO_COLOR)
 +        term_start_color(hpcolor);
 +      if(hpattr!=ATR_NONE)term_start_attr(hpattr);
-+      putstr(WIN_STATUS, hpattr, newbot2);
++      putmixed(WIN_STATUS, hpattr, newbot2);
 +      if(hpattr!=ATR_NONE)term_end_attr(hpattr);
 +      if (hpcolor != NO_COLOR)
 +        term_end_color();
@@ -161,13 +161,13 @@ Subject: Enables color HP monitor for textmode NetHack.
          Sprintf(nb = eos(nb), " HD:%d", mons[u.umonnum].mlevel);
 --- a/src/options.c
 +++ b/src/options.c
-@@ -112,6 +112,9 @@ static struct Bool_Opt {
- #else
-     { "extmenu", (boolean *) 0, FALSE, SET_IN_FILE },
- #endif
+@@ -128,6 +128,9 @@ static struct Bool_Opt {
+     { "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 },
 +#if defined(TEXTCOLOR) && defined(HPMON)
-+        { "hpmon", &iflags.use_hpmon, FALSE, SET_IN_GAME},
++    { "hpmon", &iflags.use_hpmon, FALSE, SET_IN_GAME},
 +#endif
- #ifdef OPT_DISPMAP
-     { "fast_map", &flags.fast_map, TRUE, SET_IN_GAME },
+ #ifndef MAC
+     { "ignintr", &flags.ignintr, FALSE, SET_IN_GAME },
  #else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/nethack.git