From 12c013ee28fe1d207a41bbd874cefb309cde09aa Mon Sep 17 00:00:00 2001 From: PatR Date: Thu, 11 Jun 2015 14:09:17 -0700 Subject: [PATCH] more menustyle Make the list of menustyle values in the game match their order in the revised documentation: traditional, combination, full, partial. --- dat/opthelp | 18 ++++++++++-------- include/hack.h | 6 +++--- src/options.c | 6 +++--- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dat/opthelp b/dat/opthelp index 32edf0012..cffc7b12e 100644 --- a/dat/opthelp +++ b/dat/opthelp @@ -103,10 +103,12 @@ disclose the types of information you want offered at the end of the fruit the name of a fruit you enjoy eating [slime mold] (basically a whimsy which NetHack uses from time to time). menustyle user interface for selection of multiple objects: - Traditional -- one object at a time prompting; - Combination -- prompt for classes of interest, then menu; - Partial -- skip class prompt, use menu of all objects; - Full -- menu for classes of interest, then object menu; + Traditional -- prompt for classes of interest, then + prompt item-by-item for those classes; + Combination -- prompt for classes of interest, then + use a menu for choosing items; + Full -- menu for classes of interest, then item menu; + Partial -- skip class filtering, use menu of all items; only the first letter ('T','C','P','F') matters; 'N' (None) is a synonym for 'T', as is boolean style negation [Full] number_pad alphabetic versus numeric control over movement: @@ -202,16 +204,16 @@ menu_* create single character accelerators for menu commands. Below ports that implement them: 'x' is X11, 't' is tty, 'g' is Gem, 'a' is Amiga. menu_deselect_all deselect all items in a menu [-](gxta) - menu_deselect_page deselect all items on this page of a menu [\](gta) + menu_deselect_page deselect all items on this menu page [\](gta) menu_first_page jump to the first page in a menu [^](gta) menu_invert_all invert all items in a menu [@](gxta) - menu_invert_page invert all items on this page of a menu [~](gta) + menu_invert_page invert all items on this menu page [~](gta) menu_last_page jump to the last page in a menu [|](gta) menu_next_page goto the next menu page [>](gta) menu_previous_page goto the previous menu page [<](gta) - menu_search search for a menu item [:](gxa) + menu_search search for a menu item [:](gxta) menu_select_all select all items in a menu [.](gxta) - menu_select_page select all items on this page of a menu [,](gta) + menu_select_page select all items on this menu page [,](gta) monsters like dungeon, but for monster symbols default: abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ@\ \\&;:~] diff --git a/include/hack.h b/include/hack.h index 1320faccc..319f4d344 100644 --- a/include/hack.h +++ b/include/hack.h @@ -1,4 +1,4 @@ -/* NetHack 3.6 hack.h $NHDT-Date: 1432512781 2015/05/25 00:13:01 $ $NHDT-Branch: master $:$NHDT-Revision: 1.64 $ */ +/* NetHack 3.6 hack.h $NHDT-Date: 1434056948 2015/06/11 21:09:08 $ $NHDT-Branch: master $:$NHDT-Revision: 1.66 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -355,8 +355,8 @@ NEARDATA extern coord bhitpos; /* place where throw or zap hits or stops */ #define MENUTYPELEN sizeof("traditional ") #define MENU_TRADITIONAL 0 #define MENU_COMBINATION 1 -#define MENU_PARTIAL 2 -#define MENU_FULL 3 +#define MENU_FULL 2 +#define MENU_PARTIAL 3 #define MENU_SELECTED TRUE #define MENU_UNSELECTED FALSE diff --git a/src/options.c b/src/options.c index acb1f39bc..ebd07b560 100644 --- a/src/options.c +++ b/src/options.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 options.c $NHDT-Date: 1433283602 2015/06/02 22:20:02 $ $NHDT-Branch: master $:$NHDT-Revision: 1.216 $ */ +/* NetHack 3.6 options.c $NHDT-Date: 1434056951 2015/06/11 21:09:11 $ $NHDT-Branch: master $:$NHDT-Revision: 1.219 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -3067,7 +3067,7 @@ boolean tinitial, tfrom_file; return; } - /* menustyle:traditional or combo or full or partial */ + /* menustyle:traditional or combination or full or partial */ if (match_optname(opts, "menustyle", 4, TRUE)) { int tmp; boolean val_required = (strlen(opts) > 5 && !negated); @@ -3361,7 +3361,7 @@ boolean tinitial, tfrom_file; } static NEARDATA const char *menutype[] = { "traditional", "combination", - "partial", "full" }; + "full", "partial" }; static NEARDATA const char *burdentype[] = { "unencumbered", "burdened", "stressed", "strained",