Add safe_wait to toggle search and wait prevention

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

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);
}