From 4590bf1f012a1598475ef1b89185862729a5df8b Mon Sep 17 00:00:00 2001 From: PatR Date: Tue, 11 Aug 2020 14:55:43 -0700 Subject: [PATCH] disclosing inventory The end of game disclosure for inventory was passing want_reply==True to the inventory display routine. I don't know why because you can't select anything. This resulted in Qt disclosure showing inventory with the [Ok] button disabled and blank boxes instead of object glyphs beside the inv letters. Changing to want_reply==False fixes both aspects of that. It has no apparent effect on tty or curses; on X11 (where [Ok] was already enabled) it disables the [Search] button, a plus. I don't know whether it might mess up final disclosure for inventory on WindowsGUI. Or whether any interface which uses perm_invent window for final inventory disclosure (if there are any) will be adversely affected. --- doc/fixes37.0 | 5 ++++- src/end.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/fixes37.0 b/doc/fixes37.0 index 38a7d212f..a6a0b83e1 100644 --- a/doc/fixes37.0 +++ b/doc/fixes37.0 @@ -1,4 +1,4 @@ -NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.282 $ $NHDT-Date: 1597098351 2020/08/10 22:25:51 $ +NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.283 $ $NHDT-Date: 1597182932 2020/08/11 21:55:32 $ General Fixes and Modified Features ----------------------------------- @@ -244,6 +244,9 @@ chatting to the quest leader in wizard mode with sufficient experience level and insufficient piety, player is asked whether alignment should be boosted; answering 'n' resulted in being prompted a second time leashing or unleashing pets wasn't updating persistent inventory window +end of game inventory disclosure passed an inappropriate argument to the + inventory display routine; not noticeable for tty and curses, + noticeable but not harmful for X11, and slightly harmful for Qt Fixes to 3.7.0-x Problems that Were Exposed Via git Repository diff --git a/src/end.c b/src/end.c index b41136009..e25657c84 100644 --- a/src/end.c +++ b/src/end.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 end.c $NHDT-Date: 1596498166 2020/08/03 23:42:46 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.211 $ */ +/* NetHack 3.7 end.c $NHDT-Date: 1597182933 2020/08/11 21:55:33 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.212 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -784,7 +784,7 @@ boolean taken; c = ask ? yn_function(qbuf, ynqchars, defquery) : defquery; if (c == 'y') { /* caller has already ID'd everything */ - (void) display_inventory((char *) 0, TRUE); + (void) display_inventory((char *) 0, FALSE); container_contents(g.invent, TRUE, TRUE, FALSE); } if (c == 'q')