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

more 'rest_on_space'

Browse Source 
Honor any key binding for <space> when rest_on_space is Off.
Toggling it On and Off remembers the key binding if there is one.
So if the RC file has BIND=\32:attributes, <space> will run #wait
when rest_on_space is On and run #attributes when it's Off.
This commit is contained in:
PatR
2022-01-22 00:30:39 -08:00
parent 6a72e48a40
commit fe4ae913cc
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cmd.c
View File

@@ -3577,6 +3577,10 @@ reset_commands(boolean initial)
update_rest_on_space();
}
/* called when 'rest_on_space' is toggled, also called by reset_commands()
from initoptions_init() which takes place before key bindings have been
processed, and by initoptions_finish() after key bindings so that we
can remember anything bound to <space> in 'unrestonspace' */
void
update_rest_on_space(void)
{
@@ -3588,8 +3592,16 @@ update_rest_on_space(void)
' ', "wait", "rest one move via 'rest_on_space' option",
donull, (IFBURIED | CMD_M_PREFIX), "waiting"
};
static const struct ext_func_tab *unrestonspace = 0;
const struct ext_func_tab *bound_f = g.Cmd.commands[' '];
g.Cmd.commands[' '] = flags.rest_on_space ? &restonspace : 0;
/* when 'rest_on_space' is On, <space> will run the #wait command;
when it is Off, <space> will use 'unrestonspace' which will either
be Null and elicit "Unknown command ' '." or have some non-Null
command bound in player's RC file */
if (bound_f != 0 && bound_f != &restonspace)
unrestonspace = bound_f;
g.Cmd.commands[' '] = flags.rest_on_space ? &restonspace : unrestonspace;
}
/* commands which accept 'm' prefix to request menu operation */