Add omit_buc -option

The option defaults to on, which is the old-style behaviour.
Turning the option off will never omit the "uncursed" -status
from inventory lines. This is pretty much required if users
want to use menucolors based on the BUC state.

diff --git a/dat/opthelp b/dat/opthelp
index 1cffdeb731365d1c3f53384279357d06f8e18032..54a348b73a0a21361212acc1dcf0d3d316ae4195 100644 (file)
--- a/dat/opthelp
+++ b/dat/opthelp
@@ -24,6 +24,7 @@ mail           enable the mail daemon                             [TRUE]
 null           allow nulls to be sent to your terminal            [TRUE]
                try turning this option off (forcing NetHack to use its own
                delay code) if moving objects seem to teleport across rooms
+omit_buc       omit "uncursed" from inventory, if possible        [TRUE]
 perm_invent    keep inventory in a permanent window               [FALSE]
 pickup_thrown  override pickup_types for thrown objects           [TRUE]
 pushweapon     when wielding a new weapon, put your previously

diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index 3dabeefef6a10160b0461789177720f76ecd0355..7315631b00ff7657d478de9f9313e962e939ed89 100644 (file)
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -2196,6 +2196,8 @@ location of the `y' and `z' keys swapped.)
 When moving by numbers, to enter a count prefix for those commands
 which accept one (such as ``12s'' to search twelve times), precede it
 with the letter `n' (``n12s'').
+.lp omit_buc
+Omit "uncursed" from inventory lists, if possible (default on).
 .lp packorder
 Specify the order to list object types in (default ``")[%?+!=/(*`0_'').
 The value of this option should be a string containing the

diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex
index 18a4913c8900bdc7c25e082497917a6b9fe1c3f3..f9fb923bc11542669f53b165dc8d833430b83628 100644 (file)
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -2641,6 +2641,9 @@ When moving by numbers, to enter a count prefix for those commands
 which accept one (such as ``{\tt 12s}'' to search twelve times), precede it
 with the letter `{\tt n}' (``{\tt n12s}'').
 %.lp
+\item[\ib{omit\_buc}]
+Omit ``uncursed'' from inventory lists, if possible (default on).
+%.lp
 \item[\ib{packorder}]
 Specify the order to list object types in (default
 ``\verb&")[%?+!=/(*`0_&''). The value of this option should be a string

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 4180fd84c53bb7d1dfcfe8ab279b859f599dae14..57a903be3d424ba1b259338b3fb57d4da5d33d3c 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -918,6 +918,7 @@ long worms can no longer be leashed
 the chest in the Castle containing the wishing wand can never be trapped
 the vibrating square is now a trap
 mimics wouldn't take on the form of "strange object"
+add an option to prevent omitting the uncursed status from inventory
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/include/flag.h b/include/flag.h
index 3c5b14e9b3bf241daca9f1fcfbf4ee69152efe7c..e849549af63808227698336e856cda7895402bb6 100644 (file)
--- a/include/flag.h
+++ b/include/flag.h
@@ -194,6 +194,7 @@ struct instance_flags {
     boolean deferred_X;       /* deferred entry into explore mode */
     boolean num_pad;          /* use numbers for movement commands */
     boolean news;             /* print news */
+    boolean omit_buc;         /* omit "uncursed" status in inventory lists */
     boolean mention_walls;    /* give feedback when bumping walls */
     boolean menu_tab_sep;     /* Use tabs to separate option menu fields */
     boolean menu_head_objsym; /* Show obj symbol in menu headings */

diff --git a/src/objnam.c b/src/objnam.c
index 51efcdf3f261e7ebec4cd419b2d5515055dd50ba..45a87c8ae65ba0444e29ebe342511ca1532a4525 100644 (file)
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -778,7 +778,7 @@ register struct obj *obj;
             Strcat(prefix, "cursed ");
         else if (obj->blessed)
             Strcat(prefix, "blessed ");
-        else if ((!known || !objects[obj->otyp].oc_charged
+        else if (!iflags.omit_buc || (!known || !objects[obj->otyp].oc_charged
                   || (obj->oclass == ARMOR_CLASS
                       || obj->oclass == RING_CLASS))
 /* For most items with charges or +/-, if you know how many

diff --git a/src/options.c b/src/options.c
index 59b0796de45da87cd3f8ede94363d79a45aded0d..78bd233980dcc427af5f4472da28613dfaa28817 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -154,6 +154,7 @@ static struct Bool_Opt {
 #endif
     { "nudist", &u.uroleplay.nudist, FALSE, DISP_IN_GAME },
     { "null", &flags.null, TRUE, SET_IN_GAME },
+    { "omit_buc", &iflags.omit_buc, TRUE, SET_IN_GAME },
 #if defined(SYSFLAGS) && defined(MAC)
     { "page_wait", &sysflags.page_wait, TRUE, SET_IN_GAME },
 #else