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

paranoid confirmation prompt

Browse Source 
yn() and company show the list of possible responses in square
brackets and the default response in parentheses:
|Do foo? [ynaq] (y)
but paranoid_querty() was using the punctuation chars backwards
|Do foo? (yes) [n]
or
|Do foo? (yes|no)
depending on the level of paranoid.  Change those to be
|Do foo? [yes|n] (n)
(default gets used for <return> but unlike yn(), not for <space>)
and
|Do foo? [yes|no]
(with no default for the latter).
This commit is contained in:
PatR
2022-12-16 12:21:23 -08:00
parent dfa5bb5941
commit 60a328bc2c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd.c
+4 -4
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 cmd.c $NHDT-Date: 1661240704 2022/08/23 07:45:04 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.616 $ */ /* NetHack 3.7 cmd.c $NHDT-Date: 1671222065 2022/12/16 20:21:05 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.650 $ */
/* 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. */
@@ -6558,7 +6558,7 @@ paranoid_query(boolean be_paranoid, const char *prompt)
if (be_paranoid) { if (be_paranoid) {
char pbuf[BUFSZ], qbuf[QBUFSZ], ans[BUFSZ]; char pbuf[BUFSZ], qbuf[QBUFSZ], ans[BUFSZ];
const char *promptprefix = "", const char *promptprefix = "",
*responsetype = ParanoidConfirm ? "(yes|no)" : "(yes) [no]"; *responsetype = ParanoidConfirm ? "[yes|no]" : "[yes|n] (n)";
int k, trylimit = 6; /* 1 normal, 5 more with "Yes or No:" prefix */ int k, trylimit = 6; /* 1 normal, 5 more with "Yes or No:" prefix */
copynchars(pbuf, prompt, BUFSZ - 1); copynchars(pbuf, prompt, BUFSZ - 1);
@@ -6585,9 +6585,9 @@ paranoid_query(boolean be_paranoid, const char *prompt)
break; break;
promptprefix = "\"Yes\" or \"No\": "; promptprefix = "\"Yes\" or \"No\": ";
} while (ParanoidConfirm && strcmpi(ans, "no") && --trylimit); } while (ParanoidConfirm && strcmpi(ans, "no") && --trylimit);
} else } else {
confirmed_ok = (yn(prompt) == 'y'); confirmed_ok = (yn(prompt) == 'y');
}
return confirmed_ok; return confirmed_ok;
} }