From bfbe4e71ce69ef562303d6d78caf91878c6043cf Mon Sep 17 00:00:00 2001 From: PatR Date: Thu, 11 Jul 2019 02:54:02 -0700 Subject: [PATCH] make #panic honor paranoid_confirmatin:quit If 'paranoid_confirmation:quit' is set, require "yes" instead of 'y' to execute the wizard mode #panic command. --- doc/Guidebook.mn | 21 +++++++++++++++++---- doc/Guidebook.tex | 26 ++++++++++++++++++++------ doc/fixes36.3 | 3 ++- src/cmd.c | 5 +++-- 4 files changed, 42 insertions(+), 13 deletions(-) diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 9b215d2fb..ce6d40df0 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -1,4 +1,4 @@ -.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.311 $ $NHDT-Date: 1562719337 2019/07/10 00:42:17 $ +.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.312 $ $NHDT-Date: 1562838836 2019/07/11 09:53:56 $ .\" .\" This is an excerpt from the 'roff' man page from the 'groff' package. .\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines. @@ -1104,6 +1104,12 @@ Autocompletes. Default key is \(oqM-e\(cq. .lp #exploremode Enter the explore mode. +.lp "" +Requires confirmation; default response is \f(CRn\fP (no). +To really switch to explore mode, respond with \f(CRy\fP. +You can set the +.op paranoid_confirmation:quit +option to require a response of \f(CRyes\fP instead. .lp "#fire " Fire ammunition from quiver. Default key is \(oqf\(cq. @@ -1211,6 +1217,12 @@ Test the panic routine. Terminates the current game. Autocompletes. Debug mode only. +.lp "" +Asks for confirmation; default is \f(CRn\fP (no); continue playing. +To really panic, respond with \f(CRy\fP. +You can set the +.op paranoid_confirmation:quit +option to require a response of \f(CRyes\fP instead. .lp "#pay " Pay your shopping bill. Default key is \(oqp\(cq. @@ -1251,10 +1263,11 @@ Default key is \(oqM-q\(cq. .lp "" Since using this command by accident would throw away the current game, you are asked to confirm your intent before quitting. -By default a response of \(oqy\(cq acknowledges that intent. +Default response is \f(CRn\fP (no); continue playing. +To really quit, respond with \f(CRy\fP. You can set the -.op paranoid_confirmation -option to require a response of \(lqyes\(rq instead. +.op paranoid_confirmation:quit +option to require a response of \f(CRyes\fP instead. .lp "#quiver " Select ammunition for quiver. Default key is \(oqQ\(cq. diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index d642cfed5..7cb9bf0b1 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -1216,7 +1216,13 @@ Advance or check weapon and spell skills. Autocompletes. Default key is `{\tt M-e}'. %.lp \item[\tb{\#exploremode}] -Enter the explore mode. +Enter the explore mode.\\ +%.lp "" +Requires confirmation; default response is `{\tt n}' (no). +To really switch to explore mode, respond with `{\tt y}'. +You can set the +{\it paranoid\verb+_+confirmation:quit\/} +option to require a response of ``{\tt yes}'' instead. %.lp \item[\tb{\#fire}] Fire ammunition from quiver. Default key is `{\tt f}'. @@ -1324,7 +1330,13 @@ Default keys are `{\tt \^{}O}', and `{\tt M-O}'. Test the panic routine. Terminates the current game. Autocompletes. -Debug mode only. +Debug mode only.\\ +%.lp "" +Asks for confirmation; default is `{\tt n}' (no); continue playing. +To really panic, respond with `{\tt y}''. +You can set the +{\it paranoid\verb+_+confirmation:quit\/} +option to require a response of ``{\tt yes}'' instead. %.lp \item[\tb{\#pay}] Pay your shopping bill. Default key is `{\tt p}'. @@ -1361,12 +1373,14 @@ Quaff (drink) something. Default key is `{\tt q}'. %.lp \item[\tb{\#quit}] Quit the program without saving your game. Autocompletes. -Default key is `{\tt M-q}'. +Default key is `{\tt M-q}'.\\ %.lp "" Since using this command by accident would throw away the current game, -you are asked to confirm your intent before quitting. By default a -response of `{\tt y}' acknowledges that intent. You can set the -{\it paranoid\verb+_+confirmation\/} +you are asked to confirm your intent before quitting. +Default response is `{\tt n}' (no); continue playing. +To really quit, respond with `{\tt y}'. +You can set the +{\it paranoid\verb+_+confirmation:quit\/} option to require a response of ``{\tt yes}'' instead. %.lp \item[\tb{\#quiver}] diff --git a/doc/fixes36.3 b/doc/fixes36.3 index 391e849da..909dbd345 100644 --- a/doc/fixes36.3 +++ b/doc/fixes36.3 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.93 $ $NHDT-Date: 1562832141 2019/07/11 08:02:21 $ +$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.94 $ $NHDT-Date: 1562838835 2019/07/11 09:53:55 $ This fixes36.3 file is here to capture information about updates in the 3.6.x lineage following the release of 3.6.2 in May 2019. Please note, however, @@ -104,6 +104,7 @@ detect unseen/secret door detection/^E failed to find monsters hiding under when farlook describes a monster at a visible spot as trapped, reveal the trap fix theft when poly'd into nymph form; 3.6.2 change made that anger the victim hero poly'd into nymph would steal gold along with other items +change wizard mode #panic to require "yes" if 'paranoid_confirm:quit' is set Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository diff --git a/src/cmd.c b/src/cmd.c index b4f613de1..d577d8e91 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 cmd.c $NHDT-Date: 1562532731 2019/07/07 20:52:11 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.339 $ */ +/* NetHack 3.6 cmd.c $NHDT-Date: 1562838823 2019/07/11 09:53:43 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.340 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1002,7 +1002,8 @@ wiz_panic(VOID_ARGS) u.uen = u.uenmax = 1000; return 0; } - if (yn("Do you want to call panic() and end your game?") == 'y') + if (paranoid_query(ParanoidQuit, + "Do you want to call panic() and end your game?")) panic("Crash test."); return 0; }