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

invent fixes, take II

Browse Source 
Make sure that inventory listing when carrying only gold works when
build without TTY_PERM_INVENT as well as with that.
This commit is contained in:
PatR
2022-08-15 18:00:10 -07:00
parent e9f59090c2
commit 44fc8576ed
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
win/curses/cursdial.c
View File

@@ -754,14 +754,14 @@ curses_display_nhmenu(
if (current_menu == NULL) {
impossible(
"curses_display_nhmenu: attempt to display nonexistent menu");
return '\033';
return -1; /* not ESC which falsely claims 27 items were selected */
}
menu_item_ptr = current_menu->entries;
if (menu_item_ptr == NULL) {
impossible("curses_display_nhmenu: attempt to display empty menu");
return '\033';
return -1;
}
/* Reset items to unselected to clear out selections from previous
@@ -790,15 +790,14 @@ curses_display_nhmenu(
selected = (MENU_ITEM_P *) alloc((unsigned)
(num_chosen * sizeof (MENU_ITEM_P)));
count = 0;
menu_item_ptr = current_menu->entries;
while (menu_item_ptr != NULL) {
if (menu_item_ptr->selected) {
if (count == num_chosen) {
impossible("curses_display_nhmenu: Selected items "
"exceeds expected number");
break;
"exceeds expected number");
break;
}
selected[count].item = menu_item_ptr->identifier;
selected[count].count = menu_item_ptr->count;
@@ -810,6 +809,7 @@ curses_display_nhmenu(
if (count != num_chosen) {
impossible(
"curses_display_nhmenu: Selected items less than expected number");
num_chosen = min(count, num_chosen);
}
}

2
win/curses/cursmain.c
View File

@@ -420,7 +420,7 @@ curses_display_nhwindow(winid wid, boolean block)
if (curses_is_menu(wid) || curses_is_text(wid)) {
curses_end_menu(wid, "");
curses_select_menu(wid, PICK_NONE, &selected);
(void) curses_select_menu(wid, PICK_NONE, &selected);
return;
}