nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

make #panic honor paranoid_confirmatin:quit

Browse Source 
If 'paranoid_confirmation:quit' is set, require "yes" instead of 'y'
to execute the wizard mode #panic command.
This commit is contained in:
PatR
2019-07-11 02:54:02 -07:00
parent 188eedc654
commit bfbe4e71ce
4 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
doc/Guidebook.mn
View File

@@ -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. .\" This is an excerpt from the 'roff' man page from the 'groff' package.
.\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines. .\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines.
@@ -1104,6 +1104,12 @@ Autocompletes.
Default key is \(oqM-e\(cq. Default key is \(oqM-e\(cq.
.lp #exploremode .lp #exploremode
Enter the explore mode. 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 " .lp "#fire "
Fire ammunition from quiver. Fire ammunition from quiver.
Default key is \(oqf\(cq. Default key is \(oqf\(cq.
@@ -1211,6 +1217,12 @@ Test the panic routine.
Terminates the current game. Terminates the current game.
Autocompletes. Autocompletes.
Debug mode only. 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 " .lp "#pay "
Pay your shopping bill. Pay your shopping bill.
Default key is \(oqp\(cq. Default key is \(oqp\(cq.
@@ -1251,10 +1263,11 @@ Default key is \(oqM-q\(cq.
.lp "" .lp ""
Since using this command by accident would throw away the current game, Since using this command by accident would throw away the current game,
you are asked to confirm your intent before quitting. 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 You can set the
.op paranoid_confirmation .op paranoid_confirmation:quit
option to require a response of \(lqyes\(rq instead. option to require a response of \f(CRyes\fP instead.
.lp "#quiver " .lp "#quiver "
Select ammunition for quiver. Select ammunition for quiver.
Default key is \(oqQ\(cq. Default key is \(oqQ\(cq.

26
doc/Guidebook.tex
View File

@@ -1216,7 +1216,13 @@ Advance or check weapon and spell skills. Autocompletes.
Default key is `{\tt M-e}'. Default key is `{\tt M-e}'.
%.lp %.lp
\item[\tb{\#exploremode}] \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 %.lp
\item[\tb{\#fire}] \item[\tb{\#fire}]
Fire ammunition from quiver. Default key is `{\tt f}'. 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. Test the panic routine.
Terminates the current game. Terminates the current game.
Autocompletes. 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 %.lp
\item[\tb{\#pay}] \item[\tb{\#pay}]
Pay your shopping bill. Default key is `{\tt p}'. Pay your shopping bill. Default key is `{\tt p}'.
@@ -1361,12 +1373,14 @@ Quaff (drink) something. Default key is `{\tt q}'.
%.lp %.lp
\item[\tb{\#quit}] \item[\tb{\#quit}]
Quit the program without saving your game. Autocompletes. Quit the program without saving your game. Autocompletes.
Default key is `{\tt M-q}'. Default key is `{\tt M-q}'.\\
%.lp "" %.lp ""
Since using this command by accident would throw away the current game, Since using this command by accident would throw away the current game,
you are asked to confirm your intent before quitting. By default a you are asked to confirm your intent before quitting.
response of `{\tt y}' acknowledges that intent. You can set the Default response is `{\tt n}' (no); continue playing.
{\it paranoid\verb+_+confirmation\/} 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. option to require a response of ``{\tt yes}'' instead.
%.lp %.lp
\item[\tb{\#quiver}] \item[\tb{\#quiver}]

3
doc/fixes36.3
View File

@@ -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 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, 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 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 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 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 Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository

5
src/cmd.c
View File

@@ -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) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1002,7 +1002,8 @@ wiz_panic(VOID_ARGS)
u.uen = u.uenmax = 1000; u.uen = u.uenmax = 1000;
return 0; 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."); panic("Crash test.");
return 0; return 0;
} }