From: PatR Date: Sun, 2 Oct 2022 19:42:12 +0000 (-0700) Subject: fix wishing help for X11 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8bfeb4dca62ab8a6360681d7cab1eda78fc8d7c;p=nethack fix wishing help for X11 Pass the wait-for-response arg when displaying the wishing help text window. tty, curses, and Qt waited regardless, but X11 honors the no-wait request. It was showing the text window then letting the core immediately resume, resulting in reissuing the wish prompt on top of the help window. Entering a successful wish then dismissed the prompt but left the help on the screen, possibly obscuring the map depending on placement. --- diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt index f932bcaec..7601c87ca 100644 --- a/doc/fixes3-7-0.txt +++ b/doc/fixes3-7-0.txt @@ -1,4 +1,4 @@ -HDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.1046 $ $NHDT-Date: 1664616859 2022/10/01 09:34:19 $ +HDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.1048 $ $NHDT-Date: 1664739714 2022/10/02 19:41:54 $ General Fixes and Modified Features ----------------------------------- @@ -1042,6 +1042,7 @@ orc hero has maximum 18/50 strength but hero poly'd into an orc got 18/100 hero with exceptional strength (18/01..18/100) retained that when polymorphed into any monster lacking the strongmonst attribute give hero poly'd into a giant 19 strength instead of 18/100 +wait for a response after displaying wishing help; affects X11 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository diff --git a/src/zap.c b/src/zap.c index 224b2d1b4..3a9f3a538 100644 --- a/src/zap.c +++ b/src/zap.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 zap.c $NHDT-Date: 1654886101 2022/06/10 18:35:01 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.426 $ */ +/* NetHack 3.7 zap.c $NHDT-Date: 1664739715 2022/10/02 19:41:55 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.440 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */ /* NetHack may be freely redistributed. See license for details. */ @@ -5626,7 +5626,7 @@ wishcmdassist(int triesleft) putstr(win, 0, ""); if (iflags.cmdassist) putstr(win, 0, suppress_cmdassist); - display_nhwindow(win, FALSE); + display_nhwindow(win, TRUE); destroy_nhwindow(win); }