couple more command tweaks

Rename "seegold" to "showgold".  The character to invoke it ('$')
is similar to those for the various "seeXYZ" commands ('[','=',&c)
but unlike them, it isn't part of "seeall" ('*').

Expand or replace the one-line description of several commands
(shell, showgold, showtrap, suspend, versionshort).
This commit is contained in:
PatR
2020-12-04 02:58:03 -08:00
parent 6056799e22
commit 0ba4184206
2 changed files with 12 additions and 8 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.371 $ $NHDT-Date: 1606954304 2020/12/03 00:11:44 $ NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.373 $ $NHDT-Date: 1607079461 2020/12/04 10:57:41 $
General Fixes and Modified Features General Fixes and Modified Features
----------------------------------- -----------------------------------
@@ -315,7 +315,7 @@ try to fix message sequencing for tame golems that "roast/rot/rust in peace"
autodescribe when moving the cursor was erroneously honoring MSGTYPE=stop autodescribe when moving the cursor was erroneously honoring MSGTYPE=stop
and potentially delivering sounds and potentially delivering sounds
reduce the number of "seeXYZ" commands by renaming some: #seenv -> #wizseenv, reduce the number of "seeXYZ" commands by renaming some: #seenv -> #wizseenv,
#seespells -> #showspells, and #seetrap -> #showtrap #seegold -> #showgold, #seespells -> #showspells, #seetrap -> #showtrap
when saving while punished or game ends while punished, handling for ball and when saving while punished or game ends while punished, handling for ball and
chain might access freed memory with unpredictable consequences chain might access freed memory with unpredictable consequences
+10 -6
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 cmd.c $NHDT-Date: 1606781767 2020/12/01 00:16:07 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.426 $ */ /* NetHack 3.7 cmd.c $NHDT-Date: 1607079461 2020/12/04 10:57:41 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.427 $ */
/* 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. */
@@ -1873,26 +1873,29 @@ struct ext_func_tab extcmdlist[] = {
dopramulet, IFBURIED }, dopramulet, IFBURIED },
{ ARMOR_SYM, "seearmor", "show the armor currently worn", { ARMOR_SYM, "seearmor", "show the armor currently worn",
doprarm, IFBURIED }, doprarm, IFBURIED },
{ GOLD_SYM, "seegold", "count your gold", doprgold, IFBURIED },
{ RING_SYM, "seerings", "show the ring(s) currently worn", { RING_SYM, "seerings", "show the ring(s) currently worn",
doprring, IFBURIED }, doprring, IFBURIED },
{ TOOL_SYM, "seetools", "show the tools currently in use", { TOOL_SYM, "seetools", "show the tools currently in use",
doprtool, IFBURIED }, doprtool, IFBURIED },
{ WEAPON_SYM, "seeweapon", "show the weapon currently wielded", { WEAPON_SYM, "seeweapon", "show the weapon currently wielded",
doprwep, IFBURIED }, doprwep, IFBURIED },
{ '!', "shell", "do a shell escape", { '!', "shell", "leave game to enter a sub-shell ('exit' to come back)",
dosh_core, IFBURIED | GENERALCMD dosh_core, IFBURIED | GENERALCMD
#ifndef SHELL #ifndef SHELL
| CMD_NOT_AVAILABLE | CMD_NOT_AVAILABLE
#endif /* SHELL */ #endif /* SHELL */
}, },
/* $ is like ),=,&c but is not included with *, so not called "seegold" */
{ GOLD_SYM, "showgold", "show gold, possibly shop credit or debt",
doprgold, IFBURIED },
{ SPBOOK_SYM, "showspells", "list and reorder known spells", { SPBOOK_SYM, "showspells", "list and reorder known spells",
dovspell, IFBURIED }, dovspell, IFBURIED },
{ '^', "showtrap", "show the type of adjacent trap", doidtrap, IFBURIED }, { '^', "showtrap", "describe an adjacent, discovered trap",
doidtrap, IFBURIED },
{ M('s'), "sit", "sit down", dosit, AUTOCOMPLETE }, { M('s'), "sit", "sit down", dosit, AUTOCOMPLETE },
{ '\0', "stats", "show memory statistics", { '\0', "stats", "show memory statistics",
wiz_show_stats, IFBURIED | AUTOCOMPLETE | WIZMODECMD }, wiz_show_stats, IFBURIED | AUTOCOMPLETE | WIZMODECMD },
{ C('z'), "suspend", "suspend the game", { C('z'), "suspend", "push game to background ('fg' to come back)",
dosuspend_core, IFBURIED | GENERALCMD dosuspend_core, IFBURIED | GENERALCMD
#ifndef SUSPEND #ifndef SUSPEND
| CMD_NOT_AVAILABLE | CMD_NOT_AVAILABLE
@@ -1922,7 +1925,8 @@ struct ext_func_tab extcmdlist[] = {
{ M('v'), "version", { M('v'), "version",
"list compile time options for this version of NetHack", "list compile time options for this version of NetHack",
doextversion, IFBURIED | AUTOCOMPLETE | GENERALCMD }, doextversion, IFBURIED | AUTOCOMPLETE | GENERALCMD },
{ 'v', "versionshort", "show version", doversion, IFBURIED | GENERALCMD }, { 'v', "versionshort", "show version and date/time program was built",
doversion, IFBURIED | GENERALCMD },
{ '\0', "vision", "show vision array", { '\0', "vision", "show vision array",
wiz_show_vision, IFBURIED | AUTOCOMPLETE | WIZMODECMD }, wiz_show_vision, IFBURIED | AUTOCOMPLETE | WIZMODECMD },
{ '.', "wait", "rest one move while doing nothing", { '.', "wait", "rest one move while doing nothing",