curses vs !HILITE_STATUS

The curses interface wouldn't build with HILITE_STATUS disabled.  I
started adapting it to handle genl_status_update() but that was taking
too much effort with each niggling detail leading to another.  This
goes the opposite direction:  forcing the old STATUS_VIA_WINDOWPORT
behavior without having that #define available.  That dragged along a
bunch of unexpected changes too.
This commit is contained in:
PatR
2019-04-06 15:53:51 -07:00
parent f52e9865f2
commit 0e425d645f
8 changed files with 88 additions and 66 deletions
+8 -8
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 options.c $NHDT-Date: 1554155747 2019/04/01 21:55:47 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.362 $ */
/* NetHack 3.6 options.c $NHDT-Date: 1554591224 2019/04/06 22:53:44 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.363 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2008. */
/* NetHack may be freely redistributed. See license for details. */
@@ -4044,9 +4044,8 @@ boolean tinitial, tfrom_file;
|| boolopt[i].addr == &flags.showscore
#endif
|| boolopt[i].addr == &flags.showexp) {
#ifdef STATUS_HILITES
status_initialize(REASSESS_ONLY);
#endif
if (VIA_WINDOWPORT())
status_initialize(REASSESS_ONLY);
context.botl = TRUE;
} else if (boolopt[i].addr == &flags.invlet_constant) {
if (flags.invlet_constant) {
@@ -4088,11 +4087,12 @@ boolean tinitial, tfrom_file;
}
#endif
need_redraw = TRUE;
#ifdef STATUS_HILITES
} else if (boolopt[i].addr == &iflags.wc2_hitpointbar) {
status_initialize(REASSESS_ONLY);
need_redraw = TRUE;
#endif
if (VIA_WINDOWPORT()) {
/* [is reassessment really needed here?] */
status_initialize(REASSESS_ONLY);
need_redraw = TRUE;
}
#ifdef TEXTCOLOR
} else if (boolopt[i].addr == &iflags.use_color) {
need_redraw = TRUE;