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

curses - change some panics to impossibles.

Browse Source
This commit is contained in:
Tangles
2018-07-25 22:06:33 +10:00
committed by nhmall
parent 4a4b3fb8f1
commit 1f94456e46
3 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
win/curses/cursdial.c
View File

@@ -508,6 +508,12 @@ curses_add_nhmenu_item(winid wid, int glyph, const ANY_P * identifier,
nhmenu_item *new_item, *current_items, *menu_item_ptr;
nhmenu *current_menu = get_menu(wid);
if (current_menu == NULL) {
impossible
("curses_add_nhmenu_item: attempt to add item to nonexistent menu");
return;
}
if (str == NULL) {
return;
}
@@ -530,11 +536,6 @@ curses_add_nhmenu_item(winid wid, int glyph, const ANY_P * identifier,
new_item->count = -1;
new_item->next_item = NULL;
if (current_menu == NULL) {
panic
("curses_add_nhmenu_item: attempt to add item to nonexistant menu");
}
current_items = current_menu->entries;
menu_item_ptr = current_items;
@@ -559,12 +560,13 @@ curses_finalize_nhmenu(winid wid, const char *prompt)
{
int count = 0;
nhmenu *current_menu = get_menu(wid);
nhmenu_item *menu_item_ptr = current_menu->entries;
if (current_menu == NULL) {
panic("curses_finalize_nhmenu: attempt to finalize nonexistant menu");
impossible("curses_finalize_nhmenu: attempt to finalize nonexistent menu");
return;
}
nhmenu_item *menu_item_ptr = current_menu->entries;
while (menu_item_ptr != NULL) {
menu_item_ptr = menu_item_ptr->next_item;
count++;
@@ -590,13 +592,15 @@ curses_display_nhmenu(winid wid, int how, MENU_ITEM_P ** _selected)
*_selected = NULL;
if (current_menu == NULL) {
panic("curses_display_nhmenu: attempt to display nonexistant menu");
impossible("curses_display_nhmenu: attempt to display nonexistent menu");
return;
}
menu_item_ptr = current_menu->entries;
if (menu_item_ptr == NULL) {
panic("curses_display_nhmenu: attempt to display empty menu");
impossible("curses_display_nhmenu: attempt to display empty menu");
return;
}
/* Reset items to unselected to clear out selections from previous
@@ -631,8 +635,9 @@ curses_display_nhmenu(winid wid, int how, MENU_ITEM_P ** _selected)
while (menu_item_ptr != NULL) {
if (menu_item_ptr->selected) {
if (count == num_chosen) {
panic("curses_display_nhmenu: Selected items "
impossible("curses_display_nhmenu: Selected items "
"exceeds expected number");
break;
}
selected[count].item = menu_item_ptr->identifier;
selected[count].count = menu_item_ptr->count;
@@ -642,7 +647,7 @@ curses_display_nhmenu(winid wid, int how, MENU_ITEM_P ** _selected)
}
if (count != num_chosen) {
panic("curses_display_nhmenu: Selected items less than "
impossible("curses_display_nhmenu: Selected items less than "
"expected number");
}
}
@@ -949,7 +954,8 @@ menu_display_page(nhmenu *menu, WINDOW * win, int page_num)
}
if (menu_item_ptr == NULL) { /* Page not found */
panic("menu_display_page: attempt to display nonexistant page");
impossible("menu_display_page: attempt to display nonexistent page");
return;
}
werase(win);
@@ -1343,7 +1349,8 @@ menu_operation(WINDOW * win, nhmenu *menu, menu_op
}
if (menu_item_ptr == NULL) { /* Page not found */
panic("menu_display_page: attempt to display nonexistant page");
impossible("menu_display_page: attempt to display nonexistent page");
return 0;
}
while (menu_item_ptr != NULL) {