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

Add safe_wait to toggle search and wait prevention

Browse Source
This commit is contained in:
Pasi Kallinen
2020-10-02 18:50:19 +03:00
parent aaf88f9662
commit 396b819988
8 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/detect.c
View File

@@ -1868,17 +1868,10 @@ register int aflag; /* intrinsic autosearch vs explicit searching */
int
dosearch()
{
if (!iflags.menu_requested && !g.multi && monster_nearby()) {
char buf[QBUFSZ];
buf[0] = '\0';
if (iflags.cmdassist || !g.already_found_flag++)
Sprintf(buf, " Use '%s' prefix to force another search.",
visctrl(g.Cmd.spkeys[NHKF_REQMENU])); /* default is "m" */
Norep("You already found a monster.%s", buf);
if (cmd_safety_prevention("another search",
"You already found a monster.",
&g.already_found_flag))
return 0;
}
g.already_found_flag = 0; /* start over */
return dosearch0(0);
}

34
src/do.c
View File

@@ -1982,22 +1982,36 @@ long timeout UNUSED;
}
}
boolean
cmd_safety_prevention(cmddesc, act, flagcounter)
char *cmddesc;
char *act;
int *flagcounter;
{
if (flags.safe_wait && !iflags.menu_requested
&& !g.multi && monster_nearby()) {
char buf[QBUFSZ];
buf[0] = '\0';
if (iflags.cmdassist || !*flagcounter++)
Sprintf(buf, " Use '%s' prefix to force %s.",
visctrl(g.Cmd.spkeys[NHKF_REQMENU]), cmddesc);
Norep("%s%s", act, buf);
return TRUE;
}
*flagcounter = 0;
return FALSE;
}
/* '.' command: do nothing == rest; also the
' ' command iff 'rest_on_space' option is On */
int
donull()
{
if (!iflags.menu_requested && !g.multi && monster_nearby()) {
char buf[QBUFSZ];
buf[0] = '\0';
if (iflags.cmdassist || !g.did_nothing_flag++)
Sprintf(buf, " Use '%s' prefix to force a no-op (to rest).",
visctrl(g.Cmd.spkeys[NHKF_REQMENU])); /* default is "m" */
Norep("Are you waiting to get hit?%s", buf);
if (cmd_safety_prevention("a no-op (to rest)",
"Are you waiting to get hit?",
&g.did_nothing_flag))
return 0;
}
g.did_nothing_flag = 0; /* reset */
return 1; /* Do nothing, but let other things happen */
}