From a3b1833ab99af931b680980695f31d8814540250 Mon Sep 17 00:00:00 2001 From: nhmall Date: Wed, 10 Jun 2015 21:07:19 -0400 Subject: [PATCH] menucolors Error reported in display.c in current master code is gone, but the menucolors stuff generated the following warnings when TEXTCOLOR wasn't defined. ..\win\tty\wintty.c(1688) : warning C4013: 'term_start_color' undefined; assuming extern returning int ..\win\tty\wintty.c(1711) : warning C4013: 'term_end_color' undefined; assuming extern returning int --- win/tty/wintty.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/win/tty/wintty.c b/win/tty/wintty.c index 50c0ffb67..9aebed158 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 wintty.c $NHDT-Date: 1433806618 2015/06/08 23:36:58 $ $NHDT-Branch: master $:$NHDT-Revision: 1.104 $ */ +/* NetHack 3.6 wintty.c $NHDT-Date: 1433984834 2015/06/11 01:07:14 $ $NHDT-Branch: master $:$NHDT-Revision: 1.106 $ */ /* Copyright (c) David Cohrs, 1991 */ /* NetHack may be freely redistributed. See license for details. */ @@ -1684,8 +1684,10 @@ struct WinDesc *cw; && (menucolr = get_menu_coloring(curr->str, &color, &attr))) { term_start_attr(attr); +#ifdef TEXTCOLOR if (color != NO_COLOR) term_start_color(color); +#endif } else term_start_attr(curr->attr); for (n = 0, cp = curr->str; @@ -1707,8 +1709,10 @@ struct WinDesc *cw; } else (void) putchar(*cp); if (iflags.use_menu_color && menucolr) { +#ifdef TEXTCOLOR if (color != NO_COLOR) term_end_color(); +#endif term_end_attr(attr); } else term_end_attr(curr->attr);