Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

This commit is contained in:
nhmall
2018-12-28 10:20:47 -05:00
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -3228,7 +3228,7 @@ struct obj *obj;
(void) thitmonst(mtmp, uwep); (void) thitmonst(mtmp, uwep);
return 1; return 1;
} }
/* FALL THROUGH */ /*FALLTHRU*/
case 3: /* Surface */ case 3: /* Surface */
if (IS_AIR(levl[cc.x][cc.y].typ) || is_pool(cc.x, cc.y)) if (IS_AIR(levl[cc.x][cc.y].typ) || is_pool(cc.x, cc.y))
pline_The("hook slices through the %s.", surface(cc.x, cc.y)); pline_The("hook slices through the %s.", surface(cc.x, cc.y));
+3
View File
@@ -1143,6 +1143,7 @@ menu_get_selections(WINDOW * win, nhmenu *menu, int how)
curpage = menu_operation(win, menu, INVERT, 0); curpage = menu_operation(win, menu, INVERT, 0);
break; break;
} }
/*FALLTHRU*/
default: default:
if (isdigit(curletter)) { if (isdigit(curletter)) {
count = curses_get_count(curletter - '0'); count = curses_get_count(curletter - '0');
@@ -1255,6 +1256,8 @@ menu_get_selections(WINDOW * win, nhmenu *menu, int how)
if (how == PICK_ONE) { if (how == PICK_ONE) {
menu_clear_selections(menu); menu_clear_selections(menu);
menu_select_deselect(win, menu_item_ptr, SELECT); menu_select_deselect(win, menu_item_ptr, SELECT);
if (count)
menu_item_ptr->count = count;
num_selected = 1; num_selected = 1;
dismiss = TRUE; dismiss = TRUE;
break; break;