nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

inventory menu tweaks

Browse Source 
Add or revise a couple of comments and make a couple of code tweaks
to display_pickinv().
This commit is contained in:
PatR
2016-02-24 14:57:00 -08:00
parent 1a00fe221b
commit 45d1a45458
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/invent.c
+12 -7
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 invent.c $NHDT-Date: 1456304571 2016/02/24 09:02:51 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.194 $ */ /* NetHack 3.6 invent.c $NHDT-Date: 1456354616 2016/02/24 22:56:56 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.195 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -2053,8 +2053,12 @@ long *out_cnt;
n = (flags.perm_invent && !lets && !want_reply) ? 2 n = (flags.perm_invent && !lets && !want_reply) ? 2
: lets ? (int) strlen(lets) : lets ? (int) strlen(lets)
: !invent ? 0 : !invent->nobj ? 1 : 2; : !invent ? 0 : !invent->nobj ? 1 : 2;
if (xtra_choice || (iflags.override_ID && n == 1)) /* for xtra_choice, there's another 'item' not included in initial 'n';
for !lets (full invent) and for override_ID (wizard mode identify),
skip message_menu handling of single item even if item count was 1 */
if (xtra_choice || (n == 1 && (!lets || iflags.override_ID)))
++n; ++n;
if (n == 0) { if (n == 0) {
pline("Not carrying anything."); pline("Not carrying anything.");
return 0; return 0;
@@ -2064,7 +2068,7 @@ long *out_cnt;
if (!flags.invlet_constant) if (!flags.invlet_constant)
reassign(); reassign();
if (n == 1 && (lets || xtra_choice)) { if (n == 1) {
/* when only one item of interest, use pline instead of menus; /* when only one item of interest, use pline instead of menus;
we actually use a fake message-line menu in order to allow we actually use a fake message-line menu in order to allow
the user to perform selection at the --More-- prompt for tty */ the user to perform selection at the --More-- prompt for tty */
@@ -2090,7 +2094,9 @@ long *out_cnt;
return ret; return ret;
} }
/* count the number of items (previous count of 0,1,more is obsolete) */ /* count the number of items (preliminary count of 0,1,more was 'more'
and is now obsolete); we have at least 2 items or want to behave as
if we do (full invent and wiz_identify use this even for 1 item) */
for (n = 0, otmp = invent; otmp; otmp = otmp->nobj) for (n = 0, otmp = invent; otmp; otmp = otmp->nobj)
if (!lets || !*lets || index(lets, otmp->invlet)) if (!lets || !*lets || index(lets, otmp->invlet))
n++; n++;
@@ -2125,12 +2131,11 @@ long *out_cnt;
} }
nextclass: nextclass:
classcount = 0; classcount = 0;
any = zeroany; /* set all bits to zero */
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
otmp = oarray[i]; otmp = oarray[i];
ilet = otmp->invlet;
any = zeroany; /* zero */
if (!flags.sortpack || otmp->oclass == *invlet) { if (!flags.sortpack || otmp->oclass == *invlet) {
any = zeroany; /* all bits zero */
ilet = otmp->invlet;
if (flags.sortpack && !classcount) { if (flags.sortpack && !classcount) {
add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings, add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
let_to_name(*invlet, FALSE, let_to_name(*invlet, FALSE,