From: PatR Date: Thu, 17 Dec 2015 02:42:45 +0000 (-0800) Subject: more menu screwup X-Git-Tag: NetHack-3.6.1_RC01~1167 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92858c3e3c24224110549b1a36b98ba4e9d0394f;p=nethack more menu screwup Like the just fixed naming for discoveries list, there are several other add_menu() calls which specify instead of 0 as a useless selector on separator lines. These others are all for role selection, where menus don't get big enough to need next-page. I don't know what I was thinking at the time, although it must have seemed like a good idea for some reason.... --- diff --git a/src/role.c b/src/role.c index 7be577b7f..61a18dfd2 100644 --- a/src/role.c +++ b/src/role.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 role.c $NHDT-Date: 1446861770 2015/11/07 02:02:50 $ $NHDT-Branch: master $:$NHDT-Revision: 1.34 $ */ +/* NetHack 3.6 role.c $NHDT-Date: 1450320155 2015/12/17 02:42:35 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.35 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985-1999. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1927,7 +1927,7 @@ winid where; any.a_int = 0; /* use four spaces of padding to fake a grayed out menu choice */ Sprintf(buf, "%4s%s forces %s", "", constrainer, forcedvalue); - add_menu(where, NO_GLYPH, &any, ' ', 0, ATR_NONE, buf, + add_menu(where, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, MENU_UNSELECTED); } else if (what) { any.a_int = RS_menu_arg(which); diff --git a/win/tty/wintty.c b/win/tty/wintty.c index 4c10ddeb9..2eace09e5 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 wintty.c $NHDT-Date: 1449052583 2015/12/02 10:36:23 $ $NHDT-Branch: master $:$NHDT-Revision: 1.116 $ */ +/* NetHack 3.6 wintty.c $NHDT-Date: 1450320157 2015/12/17 02:42:37 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.117 $ */ /* Copyright (c) David Cohrs, 1991 */ /* NetHack may be freely redistributed. See license for details. */ @@ -418,7 +418,7 @@ makepicks: /* add miscellaneous menu entries */ role_menu_extra(ROLE_RANDOM, win); any.a_int = 0; /* separator, not a choice */ - add_menu(win, NO_GLYPH, &any, ' ', 0, ATR_NONE, "", + add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED); role_menu_extra(RS_RACE, win); role_menu_extra(RS_GENDER, win); @@ -502,7 +502,7 @@ makepicks: /* add miscellaneous menu entries */ role_menu_extra(ROLE_RANDOM, win); any.a_int = 0; /* separator, not a choice */ - add_menu(win, NO_GLYPH, &any, ' ', 0, ATR_NONE, "", + add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED); role_menu_extra(RS_ROLE, win); role_menu_extra(RS_GENDER, win); @@ -591,7 +591,7 @@ makepicks: /* add miscellaneous menu entries */ role_menu_extra(ROLE_RANDOM, win); any.a_int = 0; /* separator, not a choice */ - add_menu(win, NO_GLYPH, &any, ' ', 0, ATR_NONE, "", + add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED); role_menu_extra(RS_ROLE, win); role_menu_extra(RS_RACE, win); @@ -676,7 +676,7 @@ makepicks: setup_algnmenu(win, TRUE, ROLE, RACE, GEND); role_menu_extra(ROLE_RANDOM, win); any.a_int = 0; /* separator, not a choice */ - add_menu(win, NO_GLYPH, &any, ' ', 0, ATR_NONE, "", + add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED); role_menu_extra(RS_ROLE, win); role_menu_extra(RS_RACE, win); @@ -760,11 +760,11 @@ makepicks: races[RACE].adj, (GEND == 1 && roles[ROLE].name.f) ? roles[ROLE].name.f : roles[ROLE].name.m); - add_menu(win, NO_GLYPH, &any, ' ', 0, ATR_NONE, pbuf, + add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, pbuf, MENU_UNSELECTED); /* blank separator */ any.a_int = 0; - add_menu(win, NO_GLYPH, &any, ' ', 0, ATR_NONE, "", MENU_UNSELECTED); + add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED); /* [ynaq] menu choices */ any.a_int = 1; add_menu(win, NO_GLYPH, &any, 'y', 0, ATR_NONE, "Yes; start game",