diff --git a/dat/hh b/dat/hh index 951e91460..847ca02b7 100644 --- a/dat/hh +++ b/dat/hh @@ -34,8 +34,8 @@ O options set options / what-is tell what a map symbol represents \ known display list of what's been discovered | perminv interact with persistent inventory window instead of hero+map -v version display version number -V history display game history +v chronicle display a list of important events +V version display version number ^A again redo the previous command ^R redraw redraw the screen ^P prevmsg repeat previous message (consecutive ^P's repeat earlier ones) diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index b948331b0..22256c17c 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -1282,6 +1282,7 @@ Talk to someone. Default key is \(oqM-c\(cq. .lp "#chronicle" Show a list of important game events. +Default key is \(oqv\(cq. .lp "#close " Close a door. Default key is \(oqc\(cq. @@ -1382,7 +1383,6 @@ option is On, clicking on the hero (or steed when mounted) will execute this command. .lp "#history " Show long version and game history. -Default key is \(oqV\(cq. .lp #inventory Show your inventory. Default key is \(oqi\(cq. @@ -1835,7 +1835,7 @@ Default key is \(oqM-v\(cq. .lp #versionshort Show the program's version number, plus the date and time that the running copy was built from sources (not the version's release date). -Default key is \(oqv\(cq. +Default key is \(oqV\(cq. .lp "#vision " Show vision array. Autocompletes. diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 1c7841ae6..be5da967b 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -1321,7 +1321,7 @@ Cast a spell. Default key is `\texttt{Z}'. Talk to someone. Default key is `\texttt{M-c}'. %.lp \item[\#chronicle] -Show a list of important game events. +Show a list of important game events. Default key is `\texttt{v}'. %.lp \item[\#close] Close a door. Default key is `\texttt{c}'. @@ -1425,7 +1425,7 @@ option is On, clicking on the hero (or steed when mounted) will execute this command. %.lp \item[\#history] -Show long version and game history. Default key is `\texttt{V}'. +Show long version and game history. %.lp \item[\#inventory] Show your inventory. Default key is `\texttt{i}'. @@ -1913,7 +1913,7 @@ Autocompletes. Default key is `\texttt{M-v}'. \item[\#versionshort] Show the program's version number, plus the date and time that the running copy was built from sources (not the version's release date). -Default key is `\texttt{v}'. +Default key is `\texttt{V}'. %.lp \item[\#vision] Show vision array. diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt index 30abe683d..f4d2a35ca 100644 --- a/doc/fixes3-7-0.txt +++ b/doc/fixes3-7-0.txt @@ -1586,6 +1586,8 @@ priest donation amounts are explicitly stated, randomized slightly, based on peak rather than current level, and allow for bulk donations (buying larger amounts of clairvoyance/protection) if you have a lot of gold amulet of magical breathing increases power regeneration +change some command keys, 'v' is now chronicle, 'V' is versionshort, + m-prefix 'V' is longer version, remove key binding of #history Fixes to 3.7.0-x General Problems Exposed Via git Repository diff --git a/src/cmd.c b/src/cmd.c index 46200881f..a88b2d7a7 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1690,7 +1690,7 @@ struct ext_func_tab extcmdlist[] = { docast, IFBURIED, NULL }, { M('c'), "chat", "talk to someone", dotalk, IFBURIED | AUTOCOMPLETE, NULL }, - { '\0', "chronicle", "show journal of major events", + { 'v', "chronicle", "show journal of major events", do_gamelog, IFBURIED | AUTOCOMPLETE | GENERALCMD, NULL }, { 'c', "close", "close a door", doclose, 0, NULL }, @@ -1735,7 +1735,7 @@ struct ext_func_tab extcmdlist[] = { dohelp, IFBURIED | GENERALCMD, NULL }, { '\0', "herecmdmenu", "show menu of commands you can do here", doherecmdmenu, IFBURIED | AUTOCOMPLETE | GENERALCMD, NULL }, - { 'V', "history", "show long version and game history", + { '\0', "history", "show long version and game history", dohistory, IFBURIED | GENERALCMD, NULL }, { 'i', "inventory", "show your inventory", ddoinv, IFBURIED | GENERALCMD, NULL }, @@ -1923,8 +1923,8 @@ struct ext_func_tab extcmdlist[] = { { M('v'), "version", "list compile time options for this version of NetHack", doextversion, IFBURIED | AUTOCOMPLETE | GENERALCMD, NULL }, - { 'v', "versionshort", "show version and date+time program was built", - doversion, IFBURIED | GENERALCMD, NULL }, + { 'V', "versionshort", "show version and date+time program was built", + doversion, IFBURIED | GENERALCMD | CMD_M_PREFIX, NULL }, { '\0', "vision", "show vision array", wiz_show_vision, IFBURIED | AUTOCOMPLETE | WIZMODECMD, NULL }, { '.', "wait", "rest one move while doing nothing", diff --git a/src/version.c b/src/version.c index 99c36efdf..0b82963b8 100644 --- a/src/version.c +++ b/src/version.c @@ -157,6 +157,9 @@ doversion(void) { char buf[BUFSZ]; + if (iflags.menu_requested) + return doextversion(); + pline("%s", getversionstring(buf, sizeof buf)); return ECMD_OK; }