diff --git a/src/pager.c b/src/pager.c index e964554f2..0b83c4910 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1493,11 +1493,11 @@ do_screen_description( x_str = def_warnsyms[i].explanation; if (sym == (looked ? gw.warnsyms[i] : def_warnsyms[i].sym)) { if (!found) { - Sprintf(out_str, "%s%s", prefix, def_warnsyms[i].explanation); - *firstmatch = def_warnsyms[i].explanation; + Sprintf(out_str, "%s%s", prefix, x_str); + *firstmatch = x_str;; found++; } else { - found += append_str(out_str, def_warnsyms[i].explanation); + found += append_str(out_str, x_str); } /* Kludge: warning trumps boulders on the display. Reveal the boulder too or player can get confused */ @@ -1678,7 +1678,6 @@ do_look(int mode, coord *click_cc) if (!clicklook) { if (quick) { - from_screen = TRUE; /* yes, we want to use the cursor */ i = 'y'; } else { menu_item *pick_list = (menu_item *) 0; @@ -1843,7 +1842,6 @@ do_look(int mode, coord *click_cc) do { /* Reset some variables. */ pm = (struct permonst *) 0; - found = 0; out_str[0] = '\0'; if (from_screen || clicklook) { diff --git a/src/potion.c b/src/potion.c index 7bec2fcea..86a0545a9 100644 --- a/src/potion.c +++ b/src/potion.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 potion.c $NHDT-Date: 1726356849 2024/09/14 23:34:09 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.270 $ */ +/* NetHack 3.7 potion.c $NHDT-Date: 1737605675 2025/01/22 20:14:35 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.274 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2236,6 +2236,7 @@ hold_potion( obj_extract_self(potobj); /* re-insert into inventory, possibly merging with compatible stack */ potobj = hold_another_object(potobj, drop_fmt, drop_arg, hold_msg); + nhUse(potobj); flags.pickup_burden = save_pickup_burden; update_inventory(); return;