From 66e7123678fe53bfaa8066146af464e249d6f419 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Tue, 17 Mar 2026 13:31:01 +0200 Subject: [PATCH] Categorize more commands as general commands "general commands" tend to be ones which take no game time, or are non-diegetic. --- src/cmd.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/cmd.c b/src/cmd.c index e069c42ff..0969f0222 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1652,21 +1652,21 @@ struct ext_func_tab extcmdlist[] = { doextlist, IFBURIED | AUTOCOMPLETE | GENERALCMD | CMD_M_PREFIX, NULL }, { M('a'), "adjust", "adjust inventory letters", - doorganize, IFBURIED | AUTOCOMPLETE, NULL }, + doorganize, IFBURIED | AUTOCOMPLETE | GENERALCMD, NULL }, { M('A'), "annotate", "name current level", donamelevel, IFBURIED | AUTOCOMPLETE | GENERALCMD, NULL }, { 'a', "apply", "apply (use) a tool (pick-axe, key, lamp...)", doapply, CMD_M_PREFIX, NULL }, { C('x'), "attributes", "show your attributes", - doattributes, IFBURIED, NULL }, + doattributes, IFBURIED | GENERALCMD, NULL }, { '@', "autopickup", "toggle the 'autopickup' option on/off", - dotogglepickup, IFBURIED, NULL }, + dotogglepickup, IFBURIED | GENERALCMD, NULL }, #ifdef CRASHREPORT { '\0', "bugreport", "file a bug report", dobugreport, GENERALCMD | NOFUZZERCMD, NULL }, #endif { 'C', "call", "name a monster, specific object, or type of object", - docallcmd, IFBURIED, NULL }, + docallcmd, IFBURIED | GENERALCMD, NULL }, { 'Z', "cast", "zap (cast) a spell", docast, IFBURIED, NULL }, { M('c'), "chat", "talk to someone", @@ -1695,7 +1695,7 @@ struct ext_func_tab extcmdlist[] = { { 'E', "engrave", "engrave writing on the floor", doengrave, 0, NULL }, { M('e'), "enhance", "advance or check weapon and spell skills", - enhance_weapon_skill, IFBURIED | AUTOCOMPLETE, NULL }, + enhance_weapon_skill, IFBURIED | AUTOCOMPLETE | GENERALCMD, NULL }, /* #exploremode should be flagged AUTOCOMPETE but that would negatively impact frequently used #enhance by making #e become ambiguous */ { M('X'), "exploremode", "enter explore (discovery) mode", @@ -1719,9 +1719,9 @@ struct ext_func_tab extcmdlist[] = { { 'V', "history", "show long version and game history", dohistory, IFBURIED | GENERALCMD, NULL }, { 'i', "inventory", "show your inventory", - ddoinv, IFBURIED, NULL }, + ddoinv, IFBURIED | GENERALCMD, NULL }, { 'I', "inventtype", "show inventory of one specific item class", - dotypeinv, IFBURIED, NULL }, + dotypeinv, IFBURIED | GENERALCMD, NULL }, { M('i'), "invoke", "invoke an object's special powers", doinvoke, IFBURIED | AUTOCOMPLETE, NULL }, { M('j'), "jump", "jump to another location", @@ -1752,7 +1752,7 @@ struct ext_func_tab extcmdlist[] = { { M('m'), "monster", "use monster's special ability", domonability, IFBURIED | AUTOCOMPLETE, NULL }, { M('n'), "name", "same as call; name a monster or object or object type", - docallcmd, IFBURIED | AUTOCOMPLETE, NULL }, + docallcmd, IFBURIED | AUTOCOMPLETE | GENERALCMD, NULL }, { M('o'), "offer", "offer a sacrifice to the gods", dosacrifice, AUTOCOMPLETE | CMD_M_PREFIX, NULL }, { 'o', "open", "open a door", @@ -1827,17 +1827,17 @@ struct ext_func_tab extcmdlist[] = { { 's', "search", "search for traps and secret doors", dosearch, IFBURIED | CMD_M_PREFIX, "searching" }, { '*', "seeall", "show all equipment in use", - doprinuse, IFBURIED | CMD_M_PREFIX, NULL }, + doprinuse, IFBURIED | GENERALCMD | CMD_M_PREFIX, NULL }, { AMULET_SYM, "seeamulet", "show the amulet currently worn", - dopramulet, IFBURIED | CMD_M_PREFIX, NULL }, + dopramulet, IFBURIED | GENERALCMD | CMD_M_PREFIX, NULL }, { ARMOR_SYM, "seearmor", "show the armor currently worn", - doprarm, IFBURIED | CMD_M_PREFIX, NULL }, + doprarm, IFBURIED | GENERALCMD | CMD_M_PREFIX, NULL }, { RING_SYM, "seerings", "show the ring(s) currently worn", - doprring, IFBURIED | CMD_M_PREFIX, NULL }, + doprring, IFBURIED | GENERALCMD | CMD_M_PREFIX, NULL }, { TOOL_SYM, "seetools", "show the tools currently in use", - doprtool, IFBURIED | CMD_M_PREFIX, NULL }, + doprtool, IFBURIED | GENERALCMD | CMD_M_PREFIX, NULL }, { WEAPON_SYM, "seeweapon", "show the weapon currently wielded", - doprwep, IFBURIED | CMD_M_PREFIX, NULL }, + doprwep, IFBURIED | GENERALCMD | CMD_M_PREFIX, NULL }, { '!', "shell", "leave game to enter a sub-shell ('exit' to come back)", dosh_core, (IFBURIED | GENERALCMD | NOFUZZERCMD @@ -1847,11 +1847,11 @@ struct ext_func_tab extcmdlist[] = { ), NULL }, /* $ is like ),=,&c but is not included with *, so not called "seegold" */ { GOLD_SYM, "showgold", "show gold, possibly shop credit or debt", - doprgold, IFBURIED | CMD_M_PREFIX, NULL }, + doprgold, IFBURIED | GENERALCMD | CMD_M_PREFIX, NULL }, { SPBOOK_SYM, "showspells", "list and reorder known spells", - dovspell, IFBURIED, NULL }, + dovspell, IFBURIED | GENERALCMD, NULL }, { '^', "showtrap", "describe an adjacent, discovered trap", - doidtrap, IFBURIED, NULL }, + doidtrap, IFBURIED | GENERALCMD, NULL }, { M('s'), "sit", "sit down", dosit, AUTOCOMPLETE, NULL }, { '\0', "stats", "show memory statistics", @@ -1875,7 +1875,7 @@ struct ext_func_tab extcmdlist[] = { it may or may not actually invoke the #terrain command */ { '\177', "terrain", "view map without monsters or objects obstructing it", - doterrain, IFBURIED | AUTOCOMPLETE, NULL }, + doterrain, IFBURIED | GENERALCMD | AUTOCOMPLETE, NULL }, { '\0', "therecmdmenu", "menu of commands you can do from here to adjacent spot", dotherecmdmenu, AUTOCOMPLETE | GENERALCMD | MOUSECMD, NULL }, @@ -1911,7 +1911,7 @@ struct ext_func_tab extcmdlist[] = { { 'W', "wear", "wear a piece of armor", dowear, 0, NULL }, { '&', "whatdoes", "tell what a command does", - dowhatdoes, IFBURIED, NULL }, + dowhatdoes, IFBURIED | GENERALCMD, NULL }, { '/', "whatis", "show what type of thing a symbol corresponds to", dowhatis, IFBURIED | GENERALCMD, NULL }, { 'w', "wield", "wield (put in use) a weapon",